cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MDB Ignore] Converts random bedsheets to spawners + 3 bedsheets I made long time ago. (#81435)

Browse Source
This commit is contained in:
Ghom
2024-02-16 01:46:29 -07:00
committed by GitHub
parent 091b5330de
commit 16009a3ccf
41 changed files with 231 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_plasma_facility.dmm
+1 -1
View File
@@ -1016,7 +1016,7 @@
/area/ruin/plasma_facility/commons)
"pE" = (
/obj/structure/bed/maint,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/item/flashlight/flare/candle{
pixel_x = 12;
pixel_y = 9
_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
+2 -2
View File
@@ -40,7 +40,7 @@
"fD" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/blood/bubblegum,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/ruin/powered)
"gG" = (
@@ -416,7 +416,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/wood,
_maps/RandomRuins/IceRuins/icemoon_underground_frozen_comms.dmm
+1 -1
View File
@@ -63,7 +63,7 @@
"oj" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/iron/grimy{
initial_gas_mix = "ICEMOON_ATMOS"
},
_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm
+1 -1
View File
@@ -286,7 +286,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed{
_maps/RandomRuins/SpaceRuins/DJstation/quarters_1.dmm
+2 -2
View File
@@ -16,7 +16,7 @@
/area/ruin/space/djstation)
"k" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/iron/grimy,
/area/ruin/space/djstation)
"p" = (
@@ -41,7 +41,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/iron/grimy,
_maps/RandomRuins/SpaceRuins/DJstation/quarters_4.dmm
+1 -1
View File
@@ -39,7 +39,7 @@
/turf/open/floor/iron/freezer/airless,
/area/ruin/space/djstation)
"x" = (
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating/airless,
/area/ruin/space/djstation)
"A" = (
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+2 -2
View File
@@ -1958,7 +1958,7 @@
/area/ruin/space/has_grav/deepstorage/hydroponics)
"zl" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
@@ -2128,7 +2128,7 @@
"Ev" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/turf/open/floor/wood,
/area/ruin/space/has_grav/deepstorage/dorm)
"EA" = (
_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+2 -2
View File
@@ -570,7 +570,7 @@
/area/ruin/space/has_grav/hellfactory)
"cc" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/holofloor/wood,
/area/ruin/space/has_grav/hellfactory)
"cd" = (
@@ -899,7 +899,7 @@
/area/ruin/space/has_grav/hellfactoryoffice)
"xK" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/open/floor/holofloor/wood,
/area/ruin/space/has_grav/hellfactory)
_maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm
+1 -1
View File
@@ -349,7 +349,7 @@
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jt" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/carpet/black,
/area/ruin/space/has_grav/powered/hilbertresearchfacility)
"jC" = (
_maps/RandomRuins/SpaceRuins/waystation.dmm
+2 -2
View File
@@ -1143,7 +1143,7 @@
/area/ruin/space/has_grav/waystation/dorms)
"rQ" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
"rV" = (
@@ -1889,7 +1889,7 @@
/area/ruin/space/has_grav/waystation/cargobay)
"IS" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/space/has_grav/waystation/dorms)
_maps/RandomZLevels/SnowCabin.dmm
+1 -1
View File
@@ -2142,7 +2142,7 @@
/area/awaymission/cabin/caves)
"km" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/wood,
/area/awaymission/cabin/caves)
"ko" = (
_maps/map_files/Basketball/beach_bums.dmm
+3 -3
View File
@@ -1,6 +1,6 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"af" = (
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
@@ -344,7 +344,7 @@
/turf/open/misc/beach/sand,
/area/centcom/basketball)
"Jb" = (
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
@@ -360,7 +360,7 @@
/turf/open/misc/beach/sand,
/area/centcom/basketball)
"Lu" = (
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
pixel_x = 6;
pixel_y = 11
},
_maps/map_files/Birdshot/birdshot.dmm
+4 -4
View File
@@ -9299,7 +9299,7 @@
/area/station/maintenance/department/medical/central)
"dBA" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/royalblack,
/area/station/commons/dorms)
@@ -11067,7 +11067,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light/small/directional/west,
@@ -39807,7 +39807,7 @@
/area/station/security/checkpoint/customs)
"ohO" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/light/small/directional/east,
/turf/open/floor/carpet/red,
/area/station/commons/dorms)
@@ -70063,7 +70063,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/machinery/light/small/directional/west,
_maps/map_files/Deltastation/DeltaStation2.dmm
+6 -6
View File
@@ -1408,7 +1408,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/item/pillow/random,
@@ -55689,7 +55689,7 @@
/area/station/maintenance/department/science)
"nTU" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/start/hangover,
/obj/item/pillow/random,
@@ -58792,7 +58792,7 @@
/area/station/maintenance/department/science)
"oLO" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/status_display/evac/directional/east,
/obj/item/pillow/random,
/turf/open/floor/wood,
@@ -63735,7 +63735,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/machinery/status_display/evac/directional/north,
@@ -82687,7 +82687,7 @@
/area/station/tcommsat/server)
"uEo" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/status_display/evac/directional/east,
/obj/effect/landmark/start/hangover,
/obj/item/pillow/random,
@@ -93649,7 +93649,7 @@
/area/station/science/genetics)
"xso" = (
/obj/structure/bed/double,
/obj/item/bedsheet/random/double,
/obj/effect/spawner/random/bedsheet/any/double,
/turf/open/floor/wood,
/area/station/maintenance/port/aft)
"xsp" = (
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+9 -9
View File
@@ -6937,7 +6937,7 @@
/area/station/engineering/atmos/project)
"ccp" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/south{
id = "Dorm5";
@@ -10057,7 +10057,7 @@
/area/station/cargo/office)
"cXp" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/effect/mapping_helpers/broken_floor,
/turf/open/floor/wood,
/area/station/maintenance/port/fore)
@@ -10420,7 +10420,7 @@
"dcq" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/east{
id = "Dorm3";
name = "Dorm Bolt Control";
@@ -34264,7 +34264,7 @@
/area/station/hallway/secondary/service)
"kzv" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating,
/area/station/maintenance/department/medical/morgue)
"kzw" = (
@@ -41367,7 +41367,7 @@
"mJO" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/east{
id = "Dorm2";
name = "Dorm Bolt Control";
@@ -45232,7 +45232,7 @@
"nOl" = (
/obj/structure/bed,
/obj/machinery/airalarm/directional/north,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/east{
id = "Dorm4";
@@ -49799,7 +49799,7 @@
/area/station/hallway/primary/central)
"piC" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/button/door/directional/south{
id = "Dorm6";
name = "Cabin Bolt Control";
@@ -63483,7 +63483,7 @@
/obj/structure/bed{
dir = 1
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/effect/spawner/random/contraband/permabrig_gear,
@@ -66635,7 +66635,7 @@
/obj/structure/bed{
dir = 1
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 1
},
/obj/effect/turf_decal/trimline/red/filled/line{
_maps/map_files/MetaStation/MetaStation.dmm
+6 -6
View File
@@ -1124,7 +1124,7 @@
/area/station/maintenance/fore/lesser)
"avU" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/button/door/directional/east{
id = "Cabin2";
@@ -31986,7 +31986,7 @@
/area/station/medical/virology)
"lxf" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/button/door/directional/west{
id = "Cabin5";
@@ -41784,7 +41784,7 @@
"oYv" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/machinery/button/door/directional/west{
id = "Cabin4";
@@ -50133,7 +50133,7 @@
/area/station/commons/locker)
"rUo" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 1
},
@@ -51804,7 +51804,7 @@
"sBa" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/machinery/button/door/directional/east{
id = "Cabin3";
@@ -64199,7 +64199,7 @@
"wNp" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/cobweb,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
/obj/effect/landmark/start/hangover,
/obj/machinery/button/door/directional/west{
_maps/map_files/NorthStar/north_star.dmm
+5 -5
View File
@@ -26977,7 +26977,7 @@
/area/station/medical/pharmacy)
"heS" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -27019,7 +27019,7 @@
/area/station/maintenance/floor1/starboard/aft)
"hfy" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -33741,7 +33741,7 @@
/area/station/maintenance/floor1/starboard/fore)
"iTn" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/turf/open/floor/carpet/black,
/area/station/hallway/secondary/service)
"iTu" = (
@@ -63497,7 +63497,7 @@
/area/station/science/genetics)
"qBh" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 8
},
@@ -63553,7 +63553,7 @@
/area/station/commons/fitness)
"qCn" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/wood,
/area/station/medical/psychology)
"qCo" = (
_maps/map_files/tramstation/tramstation.dmm
+14 -14
View File
@@ -7420,7 +7420,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/west,
@@ -10176,7 +10176,7 @@
/area/station/command/heads_quarters/captain)
"cvg" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
@@ -11408,7 +11408,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/effect/landmark/start/assistant,
@@ -14385,7 +14385,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/south,
@@ -22999,7 +22999,7 @@
/obj/structure/bed{
dir = 8
},
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
/turf/open/floor/wood,
@@ -24884,7 +24884,7 @@
/area/station/security/brig)
"hRK" = (
/obj/structure/bed,
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/hangover,
/obj/structure/sign/clock/directional/south,
/obj/item/pillow/random,
@@ -26311,7 +26311,7 @@
/area/station/hallway/secondary/entry)
"iuJ" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
/turf/open/floor/carpet,
@@ -28841,7 +28841,7 @@
/obj/structure/bed{
dir = 8
},
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
@@ -36227,7 +36227,7 @@
/obj/structure/bed{
dir = 8
},
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/effect/landmark/start/assistant,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
@@ -45402,7 +45402,7 @@
/turf/open/floor/iron/showroomfloor,
/area/station/security/warden)
"pfm" = (
/obj/item/bedsheet/dorms_double{
/obj/effect/spawner/random/bedsheet/double{
dir = 4
},
/obj/structure/bed/double{
@@ -59280,7 +59280,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/sign/clock/directional/west,
@@ -59892,7 +59892,7 @@
/obj/structure/bed{
dir = 8
},
/obj/item/bedsheet/dorms,
/obj/effect/spawner/random/bedsheet,
/obj/structure/sign/clock/directional/east,
/obj/item/pillow/random,
/turf/open/floor/carpet,
@@ -60494,7 +60494,7 @@
/area/station/hallway/secondary/command)
"upb" = (
/obj/structure/bed/double,
/obj/item/bedsheet/dorms_double,
/obj/effect/spawner/random/bedsheet/double,
/obj/effect/landmark/start/hangover,
/obj/structure/sign/clock/directional/north,
/obj/item/pillow/random,
@@ -67525,7 +67525,7 @@
/obj/structure/bed/double{
dir = 4
},
/obj/item/bedsheet/dorms_double{
/obj/effect/spawner/random/bedsheet/double{
dir = 4
},
/obj/structure/sign/clock/directional/north,
_maps/shuttles/emergency_clown.dmm
+6 -6
View File
@@ -158,7 +158,7 @@
/area/shuttle/escape)
"aM" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"aQ" = (
@@ -246,7 +246,7 @@
/area/shuttle/escape)
"iU" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/machinery/light/small/directional/east,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
@@ -254,7 +254,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/mineral/bananium,
@@ -289,7 +289,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/machinery/light/small/directional/west,
@@ -300,7 +300,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/turf/open/floor/mineral/bananium,
@@ -315,7 +315,7 @@
"XT" = (
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/mineral/bananium,
/area/shuttle/escape)
"YC" = (
_maps/shuttles/emergency_hugcage.dmm
+6 -6
View File
@@ -3,7 +3,7 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/escape/brig)
"aR" = (
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 8
},
/obj/structure/bed,
@@ -83,7 +83,7 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/escape)
"gg" = (
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/structure/bed{
@@ -116,7 +116,7 @@
/area/shuttle/escape)
"iI" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/item/pillow/random,
/obj/effect/spawner/random/entertainment/plushie_delux,
/turf/open/floor/mineral/titanium/yellow,
@@ -148,7 +148,7 @@
/obj/structure/bed{
dir = 1
},
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/item/pillow/random,
@@ -211,7 +211,7 @@
/turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape)
"ys" = (
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 4
},
/obj/structure/bed{
@@ -327,7 +327,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/shuttle/escape/brig)
"KW" = (
/obj/item/bedsheet/random{
/obj/effect/spawner/random/bedsheet/any{
dir = 8
},
/obj/structure/bed,
_maps/shuttles/pirate_grey.dmm
+1 -1
View File
@@ -955,7 +955,7 @@
/area/shuttle/pirate)
"DP" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/floor/plating,
/area/shuttle/pirate)
"DX" = (
_maps/shuttles/pirate_silverscale.dmm
+3 -3
View File
@@ -91,7 +91,7 @@
/obj/structure/bed/pod{
dir = 4
},
/obj/item/bedsheet/black{
/obj/item/bedsheet/pirate{
dir = 4
},
/turf/open/floor/carpet/royalblack,
@@ -288,7 +288,7 @@
/area/shuttle/pirate)
"uP" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/black,
/obj/item/bedsheet/pirate,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"vw" = (
@@ -381,7 +381,7 @@
/obj/machinery/airalarm/directional/east,
/obj/effect/mapping_helpers/airalarm/all_access,
/obj/structure/bed/pod,
/obj/item/bedsheet/black,
/obj/item/bedsheet/pirate,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"zB" = (
_maps/shuttles/ruin_pirate_cutter.dmm
+4 -4
View File
@@ -344,7 +344,7 @@
"wV" = (
/obj/machinery/light/small/directional/north,
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/item/bedsheet/pirate,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/pirate)
"xb" = (
@@ -501,7 +501,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/brown{
/obj/item/bedsheet/pirate{
dir = 4
},
/obj/machinery/airalarm/directional/west,
@@ -514,7 +514,7 @@
"Ha" = (
/obj/machinery/light/small/directional/south,
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/item/bedsheet/pirate,
/turf/open/floor/iron/dark,
/area/shuttle/ruin/caravan/pirate)
"Hb" = (
@@ -838,7 +838,7 @@
/obj/structure/bed{
dir = 4
},
/obj/item/bedsheet/brown{
/obj/item/bedsheet/pirate{
dir = 4
},
/obj/machinery/firealarm/directional/west,
_maps/shuttles/whiteship_cere.dmm
+1 -1
View File
@@ -388,7 +388,7 @@
/area/shuttle/abandoned/cargo)
"oB" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/machinery/light/small/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
_maps/shuttles/whiteship_kilo.dmm
+1 -1
View File
@@ -1176,7 +1176,7 @@
/obj/structure/bed/pod{
dir = 1
},
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
_maps/shuttles/whiteship_personalshuttle.dmm
+1 -1
View File
@@ -273,7 +273,7 @@
/area/shuttle/abandoned/bridge)
"pS" = (
/obj/machinery/light/small/directional/south,
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed/pod{
_maps/templates/hilbertshotel.dmm
+1 -1
View File
@@ -76,7 +76,7 @@
/area/misc/hilbertshotel)
"q" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/turf/open/indestructible/hotelwood,
/area/misc/hilbertshotel)
"r" = (
_maps/templates/hilbertshotellore.dmm
+1 -1
View File
@@ -177,7 +177,7 @@
/area/misc/hilbertshotel)
"aU" = (
/obj/structure/bed,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/effect/decal/cleanable/dirt,
/turf/open/indestructible/hotelwood,
/area/misc/hilbertshotel)
_maps/virtual_domains/beach_bar.dmm
+1 -1
View File
@@ -859,7 +859,7 @@
/turf/open/misc/beach/sand,
/area/virtual_domain/fullbright)
"Nw" = (
/obj/item/bedsheet/dorms{
/obj/effect/spawner/random/bedsheet{
dir = 4
},
/obj/structure/bed{
code/__DEFINES/random_spawner.dm
+3
View File
@@ -0,0 +1,3 @@
///Used by bedsheets spawners to tell if it's a single or double bedsheet.
#define BEDSHEET_SINGLE "single"
#define BEDSHEET_DOUBLE "double"
code/datums/quirks/negative_quirks/all_nighter.dm
+1 -1
View File
@@ -14,7 +14,7 @@
mail_goodies = list(
/obj/item/clothing/glasses/blindfold,
/obj/item/bedsheet/random,
/obj/effect/spawner/random/bedsheet/any,
/obj/item/clothing/under/misc/pj/red,
/obj/item/clothing/head/costume/nightcap/red,
/obj/item/clothing/under/misc/pj/blue,
code/game/objects/effects/spawners/random/bedsheet.dm
+64
View File
@@ -0,0 +1,64 @@
/obj/effect/spawner/random/bedsheet
name = "random dorm bedsheet"
icon_state = "random_bedsheet"
loot = list(/obj/item/bedsheet = 8,
/obj/item/bedsheet/blue = 8,
/obj/item/bedsheet/green = 8,
/obj/item/bedsheet/grey = 8,
/obj/item/bedsheet/orange = 8,
/obj/item/bedsheet/purple = 8,
/obj/item/bedsheet/red = 8,
/obj/item/bedsheet/yellow = 8,
/obj/item/bedsheet/brown = 8,
/obj/item/bedsheet/black = 8,
/obj/item/bedsheet/patriot = 2,
/obj/item/bedsheet/rainbow = 2,
/obj/item/bedsheet/ian = 2,
/obj/item/bedsheet/runtime = 2,
/obj/item/bedsheet/cosmos = 2,
/obj/item/bedsheet/nanotrasen = 2,
/obj/item/bedsheet/pirate = 2,
/obj/item/bedsheet/gondola = 1,
)
/obj/effect/spawner/random/bedsheet/double
name = "random dorm double bedsheet"
icon_state = "random_doublesheet"
loot = list(
/obj/item/bedsheet/double = 4,
/obj/item/bedsheet/blue/double = 4,
/obj/item/bedsheet/green/double = 4,
/obj/item/bedsheet/grey/double = 4,
/obj/item/bedsheet/orange/double = 4,
/obj/item/bedsheet/purple/double = 4,
/obj/item/bedsheet/red/double = 4,
/obj/item/bedsheet/yellow/double = 4,
/obj/item/bedsheet/brown/double = 4,
/obj/item/bedsheet/black/double = 4,
/obj/item/bedsheet/patriot/double = 1,
/obj/item/bedsheet/rainbow/double = 1,
/obj/item/bedsheet/ian/double = 1,
/obj/item/bedsheet/runtime/double = 1,
/obj/item/bedsheet/cosmos/double = 1,
/obj/item/bedsheet/nanotrasen/double = 1,
)
/obj/effect/spawner/random/bedsheet/any
name = "random single bedsheet"
loot = null
var/static/list/bedsheet_list = list()
var/spawn_type = BEDSHEET_SINGLE
/obj/effect/spawner/random/bedsheet/any/Initialize(mapload)
if(isnull(bedsheet_list[spawn_type]))
var/list/spawn_list = list()
for(var/obj/item/bedsheet/sheet as anything in typesof(/obj/item/bedsheet))
if(initial(sheet.bedsheet_type) == spawn_type)
spawn_list += sheet
bedsheet_list[spawn_type] = spawn_list
loot = bedsheet_list[spawn_type]
return ..()
/obj/effect/spawner/random/bedsheet/any/double
icon_state = "random_doublesheet"
spawn_type = BEDSHEET_DOUBLE
code/game/objects/items/stacks/sheets/leather.dm
+6 -5
View File
@@ -40,11 +40,6 @@ GLOBAL_LIST_INIT(human_recipes, list( \
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/animalhide/corgi
GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1, check_density = FALSE, category = CAT_CLOTHING), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2, check_density = FALSE, category = CAT_CLOTHING), \
))
/obj/item/stack/sheet/animalhide/corgi/five
amount = 5
@@ -59,6 +54,12 @@ GLOBAL_LIST_INIT(gondola_recipes, list ( \
/obj/item/stack/sheet/animalhide/mothroach/five
amount = 5
GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1, check_density = FALSE, category = CAT_CLOTHING), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/costume/gondola, 2, check_density = FALSE, category = CAT_CLOTHING), \
new/datum/stack_recipe("gondola bedsheet", /obj/item/bedsheet/gondola, 1, check_density = FALSE, category = CAT_FURNITURE), \
))
/obj/item/stack/sheet/animalhide/gondola
name = "gondola hide"
desc = "The extremely valuable product of gondola hunting."
code/game/objects/structures/bedsheet_bin.dm
+63 -104
View File
@@ -4,10 +4,6 @@ BEDSHEETS
LINEN BINS
*/
#define BEDSHEET_ABSTRACT "abstract"
#define BEDSHEET_SINGLE "single"
#define BEDSHEET_DOUBLE "double"
/obj/item/bedsheet
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
@@ -28,7 +24,9 @@ LINEN BINS
dog_fashion = /datum/dog_fashion/head/ghost
/// Custom nouns to act as the subject of dreams
var/list/dream_messages = list("white")
/// The number of cloth sheets to be dropped by this bedsheet when cut
/// Cutting it up will yield this.
var/stack_type = /obj/item/stack/sheet/cloth
/// The number of sheets dropped by this bedsheet when cut
var/stack_amount = 3
/// Denotes if the bedsheet is a single, double, or other kind of bedsheet
var/bedsheet_type = BEDSHEET_SINGLE
@@ -126,7 +124,7 @@ LINEN BINS
/obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness())
if (!(flags_1 & HOLOGRAM_1))
var/obj/item/stack/sheet/cloth/shreds = new (get_turf(src), stack_amount)
var/obj/item/stack/shreds = new stack_type(get_turf(src), stack_amount)
if(!QDELETED(shreds)) //stacks merged
transfer_fingerprints_to(shreds)
shreds.add_fingerprint(user)
@@ -338,6 +336,60 @@ LINEN BINS
inhand_icon_state = "sheetian"
dream_messages = list("a dog", "a corgi", "woof", "bark", "arf")
/obj/item/bedsheet/runtime
icon_state = "sheetruntime"
inhand_icon_state = "sheetruntime"
dream_messages = list("a kitty", "a cat", "meow", "purr", "nya~")
/obj/item/bedsheet/pirate
name = "pirate's bedsheet"
desc = "It has a Jolly Roger emblem on it and has a faint scent of grog."
icon_state = "sheetpirate"
inhand_icon_state = "sheetpirate"
dream_messages = list(
"a buried treasure",
"an island",
"a monkey",
"a parrot",
"a swashbuckler",
"a talking skull",
"avast",
"being a pirate",
"'cause a pirate is free",
"doing whatever you want",
"gold",
"landlubbers",
"stealing",
"sailing the Seven Seas",
"yarr",
)
/obj/item/bedsheet/gondola
name = "gondola bedsheet"
desc = "A precious bedsheet made from the hide of a endangered and peculiar critter."
icon_state = "sheetgondola"
inhand_icon_state = "sheetgondola"
dream_messages = list("peace", "comfiness", "a rare critter", "a harmless creature")
stack_type = /obj/item/stack/sheet/animalhide/gondola
stack_amount = 1
///one of four icon states that represent its mouth
var/gondola_mouth
///one of four icon states that represent its eyes
var/gondola_eyes
/obj/item/bedsheet/gondola/Initialize(mapload)
. = ..()
gondola_mouth = "sheetgondola_mouth[rand(1, 4)]"
gondola_eyes = "sheetgondola_eyes[rand(1, 4)]"
add_overlay(gondola_mouth)
add_overlay(gondola_eyes)
/obj/item/bedsheet/gondola/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
. = ..()
if(!isinhands)
. += mutable_appearance(icon_file, gondola_mouth)
. += mutable_appearance(icon_file, gondola_eyes)
/obj/item/bedsheet/cosmos
name = "cosmic space bedsheet"
desc = "Made from the dreams of those who wonder at the stars."
@@ -347,66 +399,6 @@ LINEN BINS
light_power = 2
light_range = 1.4
/obj/item/bedsheet/random
icon_state = "random_bedsheet"
name = "random bedsheet"
desc = "If you're reading this description ingame, something has gone wrong! Honk!"
bedsheet_type = BEDSHEET_ABSTRACT
item_flags = ABSTRACT
var/static/list/bedsheet_list
var/spawn_type = BEDSHEET_SINGLE
/obj/item/bedsheet/random/Initialize(mapload)
..()
if(!LAZYACCESS(bedsheet_list, spawn_type))
var/list/spawn_list = list()
var/list/possible_types = typesof(/obj/item/bedsheet)
for(var/obj/item/bedsheet/sheet as anything in possible_types)
if(initial(sheet.bedsheet_type) == spawn_type)
spawn_list += sheet
LAZYSET(bedsheet_list, spawn_type, spawn_list)
var/chosen_type = pick(bedsheet_list[spawn_type])
var/obj/item/bedsheet = new chosen_type(loc)
bedsheet.dir = dir
return INITIALIZE_HINT_QDEL
/obj/item/bedsheet/random/double
icon_state = "random_bedsheet"
spawn_type = BEDSHEET_DOUBLE
/obj/item/bedsheet/dorms
icon_state = "random_bedsheet"
name = "random dorms bedsheet"
desc = "If you're reading this description ingame, something has gone wrong! Honk!"
bedsheet_type = BEDSHEET_DOUBLE
item_flags = ABSTRACT
slot_flags = null
/obj/item/bedsheet/dorms/Initialize(mapload)
..()
var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(/obj/item/bedsheet,
/obj/item/bedsheet/blue,
/obj/item/bedsheet/green,
/obj/item/bedsheet/grey,
/obj/item/bedsheet/orange,
/obj/item/bedsheet/purple,
/obj/item/bedsheet/red,
/obj/item/bedsheet/yellow,
/obj/item/bedsheet/brown,
/obj/item/bedsheet/black))
if("Special")
type = pick(list(/obj/item/bedsheet/patriot,
/obj/item/bedsheet/rainbow,
/obj/item/bedsheet/ian,
/obj/item/bedsheet/cosmos,
/obj/item/bedsheet/nanotrasen))
var/obj/item/bedsheet = new type(loc)
bedsheet.dir = dir
return INITIALIZE_HINT_QDEL
/obj/item/bedsheet/double
icon_state = "double_sheetwhite"
worn_icon_state = "sheetwhite"
@@ -559,45 +551,16 @@ LINEN BINS
worn_icon_state = "sheetian"
bedsheet_type = BEDSHEET_DOUBLE
/obj/item/bedsheet/runtime/double
icon_state = "double_sheetruntime"
worn_icon_state = "sheetruntime"
bedsheet_type = BEDSHEET_DOUBLE
/obj/item/bedsheet/cosmos/double
icon_state = "double_sheetcosmos"
worn_icon_state = "sheetcosmos"
bedsheet_type = BEDSHEET_DOUBLE
/obj/item/bedsheet/dorms_double
icon_state = "random_bedsheet"
item_flags = ABSTRACT
bedsheet_type = BEDSHEET_ABSTRACT
/obj/item/bedsheet/dorms_double/Initialize(mapload)
..()
var/type = pick_weight(list("Colors" = 80, "Special" = 20))
switch(type)
if("Colors")
type = pick(list(
/obj/item/bedsheet/double,
/obj/item/bedsheet/blue/double,
/obj/item/bedsheet/green/double,
/obj/item/bedsheet/grey/double,
/obj/item/bedsheet/orange/double,
/obj/item/bedsheet/purple/double,
/obj/item/bedsheet/red/double,
/obj/item/bedsheet/yellow/double,
/obj/item/bedsheet/brown/double,
/obj/item/bedsheet/black/double,
))
if("Special")
type = pick(list(
/obj/item/bedsheet/patriot/double,
/obj/item/bedsheet/rainbow/double,
/obj/item/bedsheet/ian/double,
/obj/item/bedsheet/cosmos/double,
/obj/item/bedsheet/nanotrasen/double,
))
var/obj/item/bedsheet = new type(loc)
bedsheet.dir = dir
return INITIALIZE_HINT_QDEL
/obj/structure/bedsheetbin
name = "linen bin"
desc = "It looks rather cosy."
@@ -736,7 +699,3 @@ LINEN BINS
add_fingerprint(user)
return COMPONENT_CANCEL_ATTACK_CHAIN
#undef BEDSHEET_ABSTRACT
#undef BEDSHEET_SINGLE
#undef BEDSHEET_DOUBLE
icons/effects/random_spawners.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 89 KiB

After

Width:  |  Height:  |  Size: 93 KiB

icons/mob/clothing/neck.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 104 KiB

After

Width:  |  Height:  |  Size: 113 KiB

icons/mob/inhands/items/bedsheet_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

icons/mob/inhands/items/bedsheet_righthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

icons/obj/bedsheets.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 66 KiB

tgstation.dme
+2
View File
@@ -184,6 +184,7 @@
#include "code\__DEFINES\radiation.dm"
#include "code\__DEFINES\radio.dm"
#include "code\__DEFINES\radioactive_nebula.dm"
#include "code\__DEFINES\random_spawner.dm"
#include "code\__DEFINES\reactions.dm"
#include "code\__DEFINES\reagents.dm"
#include "code\__DEFINES\reagents_specific_heat.dm"
@@ -2176,6 +2177,7 @@
#include "code\game\objects\effects\spawners\random\ai_module.dm"
#include "code\game\objects\effects\spawners\random\animalhide.dm"
#include "code\game\objects\effects\spawners\random\armory.dm"
#include "code\game\objects\effects\spawners\random\bedsheet.dm"
#include "code\game\objects\effects\spawners\random\bureaucracy.dm"
#include "code\game\objects\effects\spawners\random\clothing.dm"
#include "code\game\objects\effects\spawners\random\contraband.dm"
tools/UpdatePaths/Scripts/81435_bedsheet_spawners.txt
+3
View File
@@ -0,0 +1,3 @@
/obj/item/bedsheet/dorms : /obj/effect/spawner/random/bedsheet{@OLD}
/obj/item/bedsheet/dorms_double : /obj/effect/spawner/random/bedsheet/double{@OLD}
/obj/item/bedsheet/random/@SUBTYPES: /obj/effect/spawner/random/bedsheet/any/@SUBTYPES{@OLD}