Skip to content

Commit bfebf78

Browse files
[MDB Ignore] [IDB Ignore] Ports the new attack chain, loot panel, and some other stuff (#689)
1 parent 63a186a commit bfebf78

File tree

1,159 files changed

+90573
-12884
lines changed

Some content is hidden

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

1,159 files changed

+90573
-12884
lines changed

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@
14861486
/area/ruin/plasma_facility/operations)
14871487
"Ak" = (
14881488
/obj/structure/bed/maint,
1489-
/obj/item/bedsheet/dorms,
1489+
/obj/effect/spawner/random/bedsheet,
14901490
/obj/item/flashlight/flare/candle{
14911491
pixel_x = 12;
14921492
pixel_y = 9

_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"fD" = (
4141
/obj/structure/bed,
4242
/obj/effect/decal/cleanable/blood/bubblegum,
43-
/obj/item/bedsheet/random,
43+
/obj/effect/spawner/random/bedsheet/any,
4444
/turf/open/floor/wood,
4545
/area/ruin/powered)
4646
"gG" = (
@@ -416,7 +416,7 @@
416416
/obj/structure/bed{
417417
dir = 4
418418
},
419-
/obj/item/bedsheet/random{
419+
/obj/effect/spawner/random/bedsheet/any{
420420
dir = 4
421421
},
422422
/turf/open/floor/wood,

_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"oj" = (
6464
/obj/effect/decal/cleanable/dirt,
6565
/obj/structure/bed,
66-
/obj/item/bedsheet/dorms,
66+
/obj/effect/spawner/random/bedsheet,
6767
/turf/open/floor/iron/grimy{
6868
initial_gas_mix = "ICEMOON_ATMOS"
6969
},

_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
336336
dir = 4
337337
},
338-
/obj/item/bedsheet/dorms{
338+
/obj/effect/spawner/random/bedsheet{
339339
dir = 4
340340
},
341341
/obj/structure/bed{

_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/area/ruin/space/djstation)
1717
"k" = (
1818
/obj/structure/bed,
19-
/obj/item/bedsheet/random,
19+
/obj/effect/spawner/random/bedsheet/any,
2020
/turf/open/floor/iron/grimy,
2121
/area/ruin/space/djstation)
2222
"p" = (
@@ -48,7 +48,7 @@
4848
/obj/structure/bed{
4949
dir = 4
5050
},
51-
/obj/item/bedsheet/random{
51+
/obj/effect/spawner/random/bedsheet/any{
5252
dir = 4
5353
},
5454
/turf/open/floor/iron/grimy,

_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/turf/open/floor/iron/freezer/airless,
4040
/area/ruin/space/djstation)
4141
"x" = (
42-
/obj/item/bedsheet/random,
42+
/obj/effect/spawner/random/bedsheet/any,
4343
/turf/open/floor/plating/airless,
4444
/area/ruin/space/djstation)
4545
"A" = (

_maps/RandomRuins/SpaceRuins/deepstorage.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@
13101310
/area/ruin/space/has_grav/deepstorage/dorm)
13111311
"ek" = (
13121312
/obj/structure/bed/double,
1313-
/obj/item/bedsheet/dorms_double,
1313+
/obj/effect/spawner/random/bedsheet/double,
13141314
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
13151315
/turf/open/floor/wood,
13161316
/area/ruin/space/has_grav/deepstorage/dorm)
@@ -2492,7 +2492,7 @@
24922492
"pf" = (
24932493
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
24942494
/obj/structure/bed/double,
2495-
/obj/item/bedsheet/dorms_double,
2495+
/obj/effect/spawner/random/bedsheet/double,
24962496
/turf/open/floor/wood,
24972497
/area/ruin/space/has_grav/deepstorage/dorm)
24982498
"po" = (

_maps/RandomRuins/SpaceRuins/hellfactory.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@
591591
/area/ruin/space/has_grav/hellfactory)
592592
"cc" = (
593593
/obj/structure/bed,
594-
/obj/item/bedsheet/dorms,
594+
/obj/effect/spawner/random/bedsheet,
595595
/turf/open/floor/holofloor/wood,
596596
/area/ruin/space/has_grav/hellfactory)
597597
"cd" = (
@@ -912,7 +912,7 @@
912912
/area/ruin/space/has_grav/hellfactoryoffice)
913913
"xK" = (
914914
/obj/structure/bed,
915-
/obj/item/bedsheet/dorms,
915+
/obj/effect/spawner/random/bedsheet,
916916
/obj/effect/decal/cleanable/cobweb/cobweb2,
917917
/turf/open/floor/holofloor/wood,
918918
/area/ruin/space/has_grav/hellfactory)

_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
371371
"jt" = (
372372
/obj/structure/bed,
373-
/obj/item/bedsheet/dorms,
373+
/obj/effect/spawner/random/bedsheet,
374374
/turf/open/floor/carpet/black,
375375
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
376376
"jC" = (

_maps/RandomRuins/SpaceRuins/meatderelict.dmm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
/turf/open/indestructible/white,
734734
/area/ruin/space/has_grav/powered/biooutpost)
735735
"oQ" = (
736-
/obj/machinery/puzzle_button/meatderelict{
736+
/obj/machinery/puzzle/button/meatderelict{
737737
pixel_y = 32;
738738
queue_size = 4
739739
},
@@ -1669,7 +1669,7 @@
16691669
"FI" = (
16701670
/obj/item/instrument/piano_synth/headphones,
16711671
/obj/structure/table,
1672-
/obj/machinery/puzzle_button/directional/north{
1672+
/obj/machinery/puzzle/button/directional/north{
16731673
used = 1
16741674
},
16751675
/obj/effect/turf_decal/tile/neutral/opposingcorners,
@@ -1820,7 +1820,7 @@
18201820
/turf/open/floor/iron/dark/textured_large,
18211821
/area/ruin/space/has_grav/powered/biooutpost/vault)
18221822
"Jt" = (
1823-
/obj/machinery/puzzle_button/directional/north{
1823+
/obj/machinery/puzzle/button/directional/north{
18241824
id = "md_tosci";
18251825
name = "shield power panel"
18261826
},
@@ -1889,7 +1889,7 @@
18891889
/turf/open/indestructible/white,
18901890
/area/ruin/space/has_grav/powered/biooutpost)
18911891
"KC" = (
1892-
/obj/machinery/puzzle_button/directional/north{
1892+
/obj/machinery/puzzle/button/directional/north{
18931893
id = "md_toeng";
18941894
queue_size = 4
18951895
},
@@ -2138,7 +2138,7 @@
21382138
id = "md_armory"
21392139
},
21402140
/obj/effect/turf_decal/stripes/full,
2141-
/obj/machinery/puzzle_keycardpad/directional/south{
2141+
/obj/machinery/puzzle/keycardpad/directional/south{
21422142
id = "md_armory";
21432143
name = "armory authentication pad";
21442144
queue_size = 5

_maps/RandomRuins/SpaceRuins/waystation.dmm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@
11321132
/area/ruin/space/has_grav/waystation/dorms)
11331133
"rQ" = (
11341134
/obj/structure/bed,
1135-
/obj/item/bedsheet/random,
1135+
/obj/effect/spawner/random/bedsheet/any,
11361136
/turf/open/floor/wood,
11371137
/area/ruin/space/has_grav/waystation/dorms)
11381138
"rV" = (
@@ -1863,7 +1863,7 @@
18631863
/area/ruin/space/has_grav/waystation/cargobay)
18641864
"IS" = (
18651865
/obj/structure/bed,
1866-
/obj/item/bedsheet/random,
1866+
/obj/effect/spawner/random/bedsheet/any,
18671867
/obj/effect/decal/cleanable/dirt,
18681868
/turf/open/floor/wood,
18691869
/area/ruin/space/has_grav/waystation/dorms)

_maps/RandomZLevels/SnowCabin.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3987,7 +3987,7 @@
39873987
/area/awaymission/cabin/caves)
39883988
"km" = (
39893989
/obj/structure/bed,
3990-
/obj/item/bedsheet/dorms,
3990+
/obj/effect/spawner/random/bedsheet,
39913991
/turf/open/floor/wood,
39923992
/area/awaymission/cabin/caves)
39933993
"kn" = (

0 commit comments

Comments
 (0)