Skip to content

Explorer Redux #24202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 165 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from 75 commits
Commits
Show all changes
165 commits
Select commit Hold shift + click to select a range
1316c4b
WE'RE SO BACK
ItsMarmite Feb 1, 2024
a7e46e9
LET THERE BE SOUND
ItsMarmite Feb 1, 2024
4ec6152
More bugs
ItsMarmite Feb 4, 2024
3aef935
fixes
ItsMarmite Feb 9, 2024
f197097
sound
ItsMarmite Feb 9, 2024
899d76d
hmm
ItsMarmite Feb 10, 2024
8f50664
clothing sprites + minor code changes to clothes
Christasmurf Feb 14, 2024
aee03f0
meestake
ItsMarmite Feb 14, 2024
876f568
spritening
ItsMarmite Feb 15, 2024
8eaf259
YARR
ItsMarmite Feb 15, 2024
bbdc7bb
hiss
ItsMarmite Feb 16, 2024
a1c45df
Cyberiad explorer remap
ItsMarmite Feb 16, 2024
699634d
hand telover
ItsMarmite Feb 16, 2024
b9e56c4
delta days
ItsMarmite Feb 17, 2024
cb7b25d
rooms done
ItsMarmite Feb 17, 2024
166ae6b
VENDOR
ItsMarmite Feb 17, 2024
9510468
Mapping done
ItsMarmite Feb 17, 2024
28341f9
Salvage mapped
ItsMarmite Feb 17, 2024
b8b41fe
qol
ItsMarmite Feb 17, 2024
1c97578
Forgot the hivelord.
ItsMarmite Feb 17, 2024
e8a403d
Merge remote-tracking branch 'origin/master' into pr/ItsMarmite/24202
warriorstar-orion Feb 18, 2024
6a0b5d1
Merge pull request #2 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite Feb 18, 2024
a8e8b3a
woops
ItsMarmite Feb 18, 2024
ee511da
oops redux
ItsMarmite Feb 18, 2024
16fe145
reviews and more
ItsMarmite Feb 18, 2024
2ce7725
consistency
ItsMarmite Feb 18, 2024
5d1b3a5
Update code/game/jobs/job_globals.dm
ItsMarmite Feb 19, 2024
7277157
character
ItsMarmite Feb 19, 2024
664f836
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite Feb 19, 2024
42daac3
Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
ItsMarmite Feb 19, 2024
205ed14
Update code/game/objects/items/sellable.dm
ItsMarmite Feb 19, 2024
6088754
Update code/game/objects/effects/spawners/random_spawners.dm
ItsMarmite Feb 19, 2024
4188106
Update code/modules/mob/living/simple_animal/hostile/pirate.dm
ItsMarmite Feb 19, 2024
4bd31b8
Update code/modules/clothing/head/job_hats.dm
ItsMarmite Feb 22, 2024
17ffee1
Update code/game/objects/effects/spawners/random_spawners.dm
ItsMarmite Feb 22, 2024
20e65e9
Update code/game/objects/items/weapons/storage/boxes.dm
ItsMarmite Feb 28, 2024
7daca3e
Update code/modules/research/designs/machine_designs.dm
ItsMarmite Feb 28, 2024
f82de6b
some reviews
ItsMarmite Feb 28, 2024
9078752
Update code/game/machinery/constructable_frame.dm
ItsMarmite Feb 28, 2024
9b7561e
supply
ItsMarmite Feb 28, 2024
883c25c
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite Feb 28, 2024
34365df
area repathing and ambience
ItsMarmite Feb 28, 2024
0eeefd9
mapping
ItsMarmite Feb 28, 2024
5c576c5
metamapping
ItsMarmite Feb 28, 2024
046b2cf
Update code/game/objects/items/weapons/storage/belt.dm
ItsMarmite Mar 1, 2024
8bb58c8
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 1, 2024
58740df
the doorening
ItsMarmite Mar 1, 2024
5ba1e1b
redooring
ItsMarmite Mar 8, 2024
9249db8
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 8, 2024
4b5ac2e
modsuit
ItsMarmite Mar 8, 2024
9929dce
more reviews
ItsMarmite Mar 8, 2024
2c28202
the plasmamamninigngg
ItsMarmite Mar 8, 2024
2135f96
add random salvage generation across space ruins
warriorstar-orion Feb 18, 2024
572bd61
Merge pull request #4 from warriorstar-orion/feat/limited-loot-spawners
ItsMarmite Mar 8, 2024
1de9850
add blackbox tracking for salvage sold
warriorstar-orion Mar 8, 2024
3d10660
Merge pull request #5 from warriorstar-orion/feat/salvage-blackbox
ItsMarmite Mar 8, 2024
b60cd67
gun
ItsMarmite Mar 8, 2024
7617408
deconflicts and reviews
ItsMarmite Mar 9, 2024
d52a5b3
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
e72b914
Update code/modules/clothing/head/job_hats.dm
ItsMarmite Mar 9, 2024
a5795b5
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
a2fe5d8
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
3b927b9
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
60d685e
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
29caf09
Update code/game/objects/items/weapons/storage/garment.dm
ItsMarmite Mar 9, 2024
9f9093c
all conversations resolved
ItsMarmite Mar 9, 2024
78190a6
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite Mar 9, 2024
2195e01
maybe work now?
ItsMarmite Mar 9, 2024
efe2ecb
please no more, too many apcs
ItsMarmite Mar 9, 2024
bcc5327
Update code/modules/mob/living/simple_animal/corpse.dm
ItsMarmite Mar 9, 2024
2100b15
Update code/modules/mining/machine_vending.dm
ItsMarmite Mar 9, 2024
93ce40f
Update code/modules/clothing/suits/misc_suits.dm
ItsMarmite Mar 9, 2024
f8d6340
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
3c23d25
Update code/game/objects/items/sellable.dm
ItsMarmite Mar 9, 2024
5740c83
henri review + action figure
ItsMarmite Mar 9, 2024
53cdf00
Update code/game/objects/items/toys.dm
ItsMarmite Mar 9, 2024
21c4e42
PDA
ItsMarmite Mar 9, 2024
708d448
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite Mar 9, 2024
64057d2
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 10, 2024
815d168
conflicts
ItsMarmite Mar 10, 2024
a50bc91
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 10, 2024
f02227e
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 11, 2024
6b875eb
more conflicts
ItsMarmite Mar 11, 2024
060f17e
maybe all conflcits?
ItsMarmite Mar 11, 2024
e75cb74
wait fuck
ItsMarmite Mar 11, 2024
c4398c5
maybe fixed???
ItsMarmite Mar 11, 2024
214cb8e
KIDAN SPRITES
ItsMarmite Mar 11, 2024
15ef10e
MAYBE?
ItsMarmite Mar 11, 2024
13975bc
access fixes
ItsMarmite Mar 11, 2024
2318f84
explorer hotfixes 1:
warriorstar-orion Mar 12, 2024
34b2c56
Merge pull request #6 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite Mar 12, 2024
c568397
add salvage selling back
warriorstar-orion Mar 12, 2024
b913181
Merge pull request #7 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite Mar 12, 2024
28c0bdb
NOT FOR SALE
ItsMarmite Mar 12, 2024
a7d6c2a
oh my god actually sell the fucking salvage this time
warriorstar-orion Mar 12, 2024
004c463
Merge pull request #9 from warriorstar-orion/explorer
ItsMarmite Mar 12, 2024
c299715
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 12, 2024
4290c4f
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 12, 2024
7b9160e
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 15, 2024
ea9b175
maybe fine now?
ItsMarmite Mar 15, 2024
355dc0b
carpover
ItsMarmite Mar 15, 2024
05665cc
NO MORE CABLE
ItsMarmite Mar 15, 2024
5a686aa
balance tweaks
ItsMarmite Mar 16, 2024
df87d8a
some depot loot updates
ItsMarmite Mar 16, 2024
920b2ef
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 16, 2024
1352184
merge conflict
ItsMarmite Mar 16, 2024
7d3c9bd
deconflicted???
ItsMarmite Mar 16, 2024
daf1ec6
woops more oversights
ItsMarmite Mar 16, 2024
973c66f
skirts, bombers, exploredrobe code + sprites
Christasmurf Mar 17, 2024
f3b5caf
woops (again)
ItsMarmite Mar 17, 2024
5071052
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 18, 2024
1b1460c
deconflicting
ItsMarmite Mar 18, 2024
fe2294c
Merge remote-tracking branch 'upstream/master' into explorer
invalid-email-address Mar 18, 2024
7285fef
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite Mar 18, 2024
cdfe839
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite Mar 18, 2024
6074ce2
Merge remote-tracking branch 'upstream' into explorer
DGamerL Apr 3, 2024
bd15b8e
Merge remote-tracking branch 'origin/master' into pr/ItsMarmite/24202
warriorstar-orion Apr 21, 2024
952c479
Merge pull request #11 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite Apr 21, 2024
2a14b05
remove old explorer room again
warriorstar-orion Apr 21, 2024
03fa566
Merge pull request #12 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite Apr 25, 2024
cc593ca
Merge remote-tracking branch 'upstream/master' into explorer
ItsMarmite May 4, 2024
cd596ef
Hat fix
ItsMarmite May 4, 2024
8f047da
Merge branch 'master' into explorer
ItsMarmite May 6, 2024
650f174
minor changes to sprites and code for hats
Christasmurf May 6, 2024
20d6c34
Merge branch 'master' into pr/24202
ItsMarmite May 10, 2024
8b54b66
Merge remote-tracking branch 'upstream/master' into pr/24202
ItsMarmite May 14, 2024
a320ea4
yarrr fix 1
ItsMarmite May 14, 2024
4ea4f4c
Merge remote-tracking branch 'origin/master' into itsmarm_explorer
warriorstar-orion May 17, 2024
331b484
first fixes
warriorstar-orion May 17, 2024
2e27f10
don't drop loot from syndies gibbed by depot destruction
warriorstar-orion May 17, 2024
7ddc89c
add selling back with new signal based system
warriorstar-orion May 18, 2024
6b9af56
Merge pull request #13 from warriorstar-orion/itsmarm_explorer
ItsMarmite May 18, 2024
8586c1c
Merge remote-tracking branch 'upstream/master' into pr/24202
ItsMarmite May 18, 2024
50d7463
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite May 18, 2024
c840ef1
speedmerge this shit
ItsMarmite May 18, 2024
1b3ed73
minor changes to collars/bomber resprite
Christasmurf May 18, 2024
2ec387e
docking port in
ItsMarmite May 18, 2024
22aee52
ruins
ItsMarmite May 18, 2024
367c4f5
WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN
ItsMarmite May 18, 2024
7a3c316
no more murder hallway on whiteship
warriorstar-orion May 18, 2024
3f7b864
Merge pull request #14 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite May 18, 2024
20e40a1
undelete meson sunglasses, redelete uristrunes
warriorstar-orion May 18, 2024
baf33dd
Merge pull request #15 from warriorstar-orion/pr/ItsMarmite/24202
ItsMarmite May 18, 2024
8d57c7e
BOOTY BAGS
ItsMarmite May 19, 2024
3344720
don't drop ashdrake loot from crusher kills
warriorstar-orion May 21, 2024
8b3f439
box: fix ntrep fax, add explorer access to ORMroom
warriorstar-orion May 21, 2024
6d682d6
Merge pull request #16 from warriorstar-orion/explorer-redux-1
ItsMarmite May 21, 2024
c0d7926
Merge remote-tracking branch 'origin/master' into meh
warriorstar-orion May 21, 2024
8b30c84
Merge pull request #17 from warriorstar-orion/meh
ItsMarmite May 21, 2024
3ced00c
add meson sunglasses item icon back
warriorstar-orion May 21, 2024
e2aa44b
Merge pull request #18 from warriorstar-orion/ughghghg
ItsMarmite May 21, 2024
4752745
fix cere handtele, meta shutter control, death sound arg
warriorstar-orion May 22, 2024
51c179f
Merge pull request #19 from warriorstar-orion/finalfixes
DGamerL May 22, 2024
257e29d
cleaning up
ItsMarmite May 23, 2024
3282d9c
she mosins on my russian till i dj station
ItsMarmite May 23, 2024
13e2700
Update code/modules/clothing/head/soft_caps.dm
ItsMarmite May 25, 2024
3be2af6
Update code/modules/clothing/suits/misc_suits.dm
ItsMarmite May 25, 2024
5babcf6
Update code/modules/mining/machine_vending.dm
ItsMarmite May 25, 2024
17907c0
Update code/game/gamemodes/game_mode.dm
ItsMarmite May 26, 2024
7d84f7c
mapping
ItsMarmite May 26, 2024
9f12cdb
Merge branch 'explorer' of https://github.com/ItsMarmite/Paradise int…
ItsMarmite May 26, 2024
cfd99d2
Cleaning up
ItsMarmite May 26, 2024
12b3e67
Merge remote-tracking branch 'upstream/master' into pr/24202
ItsMarmite May 27, 2024
6252e5e
revert changes in tools/{bootstrap,ci}
warriorstar-orion May 27, 2024
6678176
Merge pull request #20 from warriorstar-orion/backout-lints
ItsMarmite May 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
677 changes: 287 additions & 390 deletions _maps/map_files/Delta/delta.dmm

Large diffs are not rendered by default.

777 changes: 308 additions & 469 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

50 changes: 36 additions & 14 deletions _maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
icon_state = "dark"
},
/area/ruin/space/abandoned_engi_sat)
"aR" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/template_noop)
"bi" = (
/obj/structure/chair/comfy/black{
dir = 8
Expand Down Expand Up @@ -240,6 +244,7 @@
/area/ruin/space/abandoned_engi_sat)
"hB" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"hE" = (
Expand Down Expand Up @@ -569,7 +574,6 @@
"pX" = (
/obj/structure/closet{
icon_state = "eng_secure";
opened = 1;
open_door_sprite = "eng_secure_door";
name = "engineer's locker"
},
Expand All @@ -579,6 +583,10 @@
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/space/abandoned_engi_sat)
"rn" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"rr" = (
/obj/structure/lattice,
/turf/template_noop,
Expand Down Expand Up @@ -1082,6 +1090,11 @@
name = "floor"
},
/area/ruin/space/abandoned_engi_sat)
"Ig" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"Iz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/wall_rusted_always,
Expand Down Expand Up @@ -1207,6 +1220,10 @@
icon_state = "blue"
},
/area/ruin/space/abandoned_engi_sat)
"OW" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"OZ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
Expand Down Expand Up @@ -1413,6 +1430,11 @@
/obj/structure/bed,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"Xq" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"XP" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -1553,13 +1575,13 @@ LP
"}
(2,1,1) = {"
LP
rn
LP
LP
LP
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -1589,9 +1611,9 @@ LP
LP
LP
LP
rn
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -1783,7 +1805,7 @@ Iz
hE
LP
LP
LP
aR
LP
LP
LP
Expand Down Expand Up @@ -1977,7 +1999,7 @@ kt
eP
fA
XP
et
OW
et
Yz
CP
Expand Down Expand Up @@ -2043,7 +2065,7 @@ kZ
Tw
YE
jG
XP
Xq
XP
Ud
fA
Expand Down Expand Up @@ -2311,7 +2333,7 @@ oL
mW
NM
mW
BR
Ig
IC
IC
ao
Expand Down Expand Up @@ -2360,11 +2382,11 @@ LP
Gi
LP
LP
rn
LP
LP
LP
LP
LP
rn
LP
"}
(26,1,1) = {"
Expand Down Expand Up @@ -2430,7 +2452,7 @@ px
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -2489,7 +2511,7 @@ uQ
qu
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -2526,7 +2548,7 @@ LP
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down
16 changes: 10 additions & 6 deletions _maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"c" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
a
Expand Down Expand Up @@ -83,7 +87,7 @@ a
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -158,7 +162,7 @@ c
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -220,10 +224,10 @@ a
a
a
a
V
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -254,7 +258,7 @@ a
(12,1,1) = {"
a
a
a
V
a
a
c
Expand Down Expand Up @@ -322,7 +326,7 @@ a
a
a
a
a
V
a
a
a
Expand Down
24 changes: 18 additions & 6 deletions _maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@
"d" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"t" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"R" = (
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
a
Expand Down Expand Up @@ -105,7 +117,7 @@ a
a
a
b
b
t
b
c
c
Expand Down Expand Up @@ -367,7 +379,7 @@ b
(17,1,1) = {"
a
a
a
V
b
a
a
Expand All @@ -388,8 +400,8 @@ a
"}
(18,1,1) = {"
a
a
a
V
V
b
b
a
Expand All @@ -400,7 +412,7 @@ a
b
b
b
b
R
b
b
b
Expand All @@ -413,7 +425,7 @@ a
a
a
a
a
V
a
a
a
Expand Down
Loading