Skip to content

Commit 5a68c5f

Browse files
ItsMarmiteChristasmurfwarriorstar-orionHenri215Burzah
authored
Explorer Redux (#24202)
* WE'RE SO BACK * LET THERE BE SOUND * More bugs * fixes * sound * hmm * clothing sprites + minor code changes to clothes * meestake * spritening * YARR * hiss * Cyberiad explorer remap * hand telover * delta days * rooms done * VENDOR * Mapping done * Salvage mapped * qol * Forgot the hivelord. * woops * oops redux * reviews and more * consistency * Update code/game/jobs/job_globals.dm Co-authored-by: Henri215 <[email protected]> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <[email protected]> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <[email protected]> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <[email protected]> * the doorening * redooring * modsuit * more reviews * the plasmamamninigngg * add random salvage generation across space ruins * add blackbox tracking for salvage sold * gun * deconflicts and reviews * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <[email protected]> * all conversations resolved * maybe work now? * please no more, too many apcs * Update code/modules/mob/living/simple_animal/corpse.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <[email protected]> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <[email protected]> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <[email protected]> * PDA * conflicts * more conflicts * maybe all conflcits? * wait fuck * maybe fixed??? * KIDAN SPRITES * MAYBE? * access fixes * explorer hotfixes 1: - fixes space pirates dying in space - gives explorers ORM access - box: fixes access on NTR airlock - box: fixes naming on BS airlock - box: adds expedition access to mail sorting room * add salvage selling back * NOT FOR SALE * oh my god actually sell the fucking salvage this time * maybe fine now? * carpover * NO MORE CABLE * balance tweaks * some depot loot updates * merge conflict * deconflicted??? * woops more oversights * skirts, bombers, exploredrobe code + sprites * woops (again) * deconflicting * remove old explorer room again * Hat fix * minor changes to sprites and code for hats * yarrr fix 1 * first fixes * don't drop loot from syndies gibbed by depot destruction * add selling back with new signal based system * speedmerge this shit * minor changes to collars/bomber resprite * docking port in * ruins * WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN * no more murder hallway on whiteship * undelete meson sunglasses, redelete uristrunes * BOOTY BAGS * don't drop ashdrake loot from crusher kills * box: fix ntrep fax, add explorer access to ORMroom * add meson sunglasses item icon back * fix cere handtele, meta shutter control, death sound arg * cleaning up * she mosins on my russian till i dj station * Update code/modules/clothing/head/soft_caps.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <[email protected]> Signed-off-by: Marm <[email protected]> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <[email protected]> Signed-off-by: Marm <[email protected]> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <[email protected]> Co-authored-by: Christasmurf <[email protected]> Co-authored-by: warriorstar-orion <[email protected]> Co-authored-by: Henri215 <[email protected]> Co-authored-by: Burzah <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: DGamerL <[email protected]> Co-authored-by: Contrabang <[email protected]>
1 parent c9f44b1 commit 5a68c5f

File tree

146 files changed

+5883
-4899
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+5883
-4899
lines changed

‎_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
icon_state = "dark"
1414
},
1515
/area/ruin/space/abandoned_engi_sat)
16+
"aR" = (
17+
/mob/living/simple_animal/hostile/carp/megacarp,
18+
/turf/template_noop,
19+
/area/template_noop)
1620
"bi" = (
1721
/obj/structure/chair/comfy/black{
1822
dir = 8
@@ -239,6 +243,7 @@
239243
/area/ruin/space/abandoned_engi_sat)
240244
"hB" = (
241245
/obj/structure/table,
246+
/obj/item/salvage/ruin/nanotrasen,
242247
/turf/simulated/floor/carpet/airless,
243248
/area/ruin/space/abandoned_engi_sat)
244249
"hE" = (
@@ -567,7 +572,6 @@
567572
"pX" = (
568573
/obj/structure/closet{
569574
icon_state = "eng_secure";
570-
opened = 1;
571575
open_door_sprite = "eng_secure_door";
572576
name = "engineer's locker"
573577
},
@@ -577,6 +581,10 @@
577581
/obj/effect/spawner/random_spawners/wall_rusted_always,
578582
/turf/simulated/wall/r_wall,
579583
/area/ruin/space/abandoned_engi_sat)
584+
"rn" = (
585+
/mob/living/simple_animal/hostile/carp,
586+
/turf/template_noop,
587+
/area/template_noop)
580588
"rr" = (
581589
/obj/structure/lattice,
582590
/turf/template_noop,
@@ -1079,6 +1087,11 @@
10791087
name = "floor"
10801088
},
10811089
/area/ruin/space/abandoned_engi_sat)
1090+
"Ig" = (
1091+
/obj/structure/table,
1092+
/obj/item/salvage/ruin/nanotrasen,
1093+
/turf/simulated/floor/plasteel,
1094+
/area/ruin/space/abandoned_engi_sat)
10821095
"Iz" = (
10831096
/obj/structure/disposalpipe/segment,
10841097
/obj/effect/spawner/random_spawners/wall_rusted_always,
@@ -1204,6 +1217,10 @@
12041217
icon_state = "blue"
12051218
},
12061219
/area/ruin/space/abandoned_engi_sat)
1220+
"OW" = (
1221+
/mob/living/simple_animal/hostile/asteroid/hivelord,
1222+
/turf/simulated/floor/plating,
1223+
/area/ruin/space/abandoned_engi_sat)
12071224
"OZ" = (
12081225
/obj/structure/lattice/catwalk,
12091226
/obj/structure/cable{
@@ -1410,6 +1427,11 @@
14101427
/obj/structure/bed,
14111428
/turf/simulated/floor/carpet/airless,
14121429
/area/ruin/space/abandoned_engi_sat)
1430+
"Xq" = (
1431+
/obj/effect/decal/cleanable/dirt,
1432+
/mob/living/simple_animal/hostile/asteroid/hivelord,
1433+
/turf/simulated/floor/plating,
1434+
/area/ruin/space/abandoned_engi_sat)
14131435
"XP" = (
14141436
/obj/effect/decal/cleanable/dirt,
14151437
/turf/simulated/floor/plating,
@@ -1550,13 +1572,13 @@ LP
15501572
"}
15511573
(2,1,1) = {"
15521574
LP
1575+
rn
15531576
LP
15541577
LP
15551578
LP
15561579
LP
15571580
LP
1558-
LP
1559-
LP
1581+
rn
15601582
LP
15611583
LP
15621584
LP
@@ -1586,9 +1608,9 @@ LP
15861608
LP
15871609
LP
15881610
LP
1611+
rn
15891612
LP
1590-
LP
1591-
LP
1613+
rn
15921614
LP
15931615
LP
15941616
LP
@@ -1780,7 +1802,7 @@ Iz
17801802
hE
17811803
LP
17821804
LP
1783-
LP
1805+
aR
17841806
LP
17851807
LP
17861808
LP
@@ -1974,7 +1996,7 @@ kt
19741996
eP
19751997
fA
19761998
XP
1977-
et
1999+
OW
19782000
et
19792001
Yz
19802002
CP
@@ -2040,7 +2062,7 @@ kZ
20402062
Tw
20412063
YE
20422064
jG
2043-
XP
2065+
Xq
20442066
XP
20452067
Ud
20462068
fA
@@ -2308,7 +2330,7 @@ oL
23082330
mW
23092331
NM
23102332
mW
2311-
BR
2333+
Ig
23122334
IC
23132335
IC
23142336
ao
@@ -2357,11 +2379,11 @@ LP
23572379
Gi
23582380
LP
23592381
LP
2382+
rn
23602383
LP
23612384
LP
23622385
LP
2363-
LP
2364-
LP
2386+
rn
23652387
LP
23662388
"}
23672389
(26,1,1) = {"
@@ -2427,7 +2449,7 @@ px
24272449
LP
24282450
LP
24292451
LP
2430-
LP
2452+
rn
24312453
LP
24322454
LP
24332455
LP
@@ -2486,7 +2508,7 @@ uQ
24862508
qu
24872509
LP
24882510
LP
2489-
LP
2511+
rn
24902512
LP
24912513
LP
24922514
LP
@@ -2523,7 +2545,7 @@ LP
25232545
LP
25242546
LP
25252547
LP
2526-
LP
2548+
rn
25272549
LP
25282550
LP
25292551
LP

‎_maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
"c" = (
99
/turf/simulated/mineral/random/high_chance,
1010
/area/ruin/space/unpowered)
11+
"V" = (
12+
/mob/living/simple_animal/hostile/carp,
13+
/turf/template_noop,
14+
/area/template_noop)
1115

1216
(1,1,1) = {"
1317
a
@@ -83,7 +87,7 @@ a
8387
a
8488
a
8589
a
86-
a
90+
V
8791
a
8892
a
8993
a
@@ -158,7 +162,7 @@ c
158162
a
159163
a
160164
a
161-
a
165+
V
162166
a
163167
a
164168
a
@@ -220,10 +224,10 @@ a
220224
a
221225
a
222226
a
227+
V
223228
a
224229
a
225-
a
226-
a
230+
V
227231
a
228232
a
229233
a
@@ -254,7 +258,7 @@ a
254258
(12,1,1) = {"
255259
a
256260
a
257-
a
261+
V
258262
a
259263
a
260264
c
@@ -322,7 +326,7 @@ a
322326
a
323327
a
324328
a
325-
a
329+
V
326330
a
327331
a
328332
a

‎_maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,18 @@
1111
"d" = (
1212
/turf/simulated/mineral/random/high_chance,
1313
/area/ruin/space/unpowered)
14+
"t" = (
15+
/obj/structure/spawner/mining/basilisk,
16+
/turf/simulated/floor/plating/asteroid/airless,
17+
/area/ruin/space/unpowered)
18+
"R" = (
19+
/obj/structure/spawner/mining/goliath,
20+
/turf/simulated/floor/plating/asteroid/airless,
21+
/area/ruin/space/unpowered)
22+
"V" = (
23+
/mob/living/simple_animal/hostile/carp,
24+
/turf/template_noop,
25+
/area/template_noop)
1426

1527
(1,1,1) = {"
1628
a
@@ -105,7 +117,7 @@ a
105117
a
106118
a
107119
b
108-
b
120+
t
109121
b
110122
c
111123
c
@@ -367,7 +379,7 @@ b
367379
(17,1,1) = {"
368380
a
369381
a
370-
a
382+
V
371383
b
372384
a
373385
a
@@ -388,8 +400,8 @@ a
388400
"}
389401
(18,1,1) = {"
390402
a
391-
a
392-
a
403+
V
404+
V
393405
b
394406
b
395407
a
@@ -400,7 +412,7 @@ a
400412
b
401413
b
402414
b
403-
b
415+
R
404416
b
405417
b
406418
b
@@ -413,7 +425,7 @@ a
413425
a
414426
a
415427
a
416-
a
428+
V
417429
a
418430
a
419431
a

0 commit comments

Comments
 (0)