Merge pull request #8740 from Ghommie/Ghommie-cit87

ports "More variety for dorms bedsheets" + 3 new bed sheets.
This commit is contained in:
deathride58
2019-07-08 18:06:11 -04:00
committed by GitHub
11 changed files with 459 additions and 421 deletions
+102 -107
View File
@@ -41,6 +41,24 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"aad" = (
/obj/structure/bed,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm4";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aae" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
@@ -577,6 +595,19 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall,
/area/security/execution/transfer)
"abz" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Dorm5";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"abA" = (
/obj/machinery/light,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -2118,6 +2149,55 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aeD" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Dorm6";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aeE" = (
/obj/structure/bed,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm3";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aeF" = (
/obj/structure/bed,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm2";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aeG" = (
/obj/structure/cable,
/obj/machinery/power/solar{
@@ -2494,6 +2574,11 @@
},
/turf/open/floor/plasteel,
/area/security/main)
"afn" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"afo" = (
/obj/machinery/door/airlock/external{
name = "Escape Pod Three"
@@ -2514,6 +2599,14 @@
},
/turf/open/space/basic,
/area/space)
"afq" = (
/obj/structure/bed,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath,
/obj/effect/decal/cleanable/semen,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plating,
/area/maintenance/bar)
"aft" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5
@@ -7410,24 +7503,6 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
"aqn" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm4";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aqo" = (
/obj/structure/chair/stool{
pixel_y = 8
@@ -8208,19 +8283,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/fitness)
"asu" = (
/obj/structure/bed,
/obj/item/bedsheet/red,
/obj/machinery/button/door{
id = "Dorm5";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asv" = (
/obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{
@@ -8312,19 +8374,6 @@
},
/turf/open/floor/plating,
/area/maintenance/port/fore)
"asL" = (
/obj/structure/bed,
/obj/item/bedsheet/red,
/obj/machinery/button/door{
id = "Dorm6";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asM" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -8931,24 +8980,6 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness)
"auw" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm3";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aux" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -10815,24 +10846,6 @@
},
/turf/open/floor/plasteel,
/area/ai_monitored/storage/eva)
"ayV" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/machinery/button/door{
id = "Dorm2";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"ayW" = (
/turf/closed/wall,
/area/ai_monitored/storage/eva)
@@ -39364,11 +39377,6 @@
/obj/machinery/announcement_system,
/turf/open/floor/plasteel,
/area/tcommsat/computer)
"bOm" = (
/obj/item/bedsheet,
/obj/structure/bed,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bOn" = (
/obj/machinery/light{
dir = 1
@@ -42630,11 +42638,6 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/medical/virology)
"bWk" = (
/obj/structure/bed,
/obj/item/bedsheet,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bWl" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -57380,14 +57383,6 @@
},
/turf/open/floor/plating,
/area/construction)
"rMN" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath,
/obj/effect/decal/cleanable/semen,
/turf/open/floor/plating,
/area/maintenance/bar)
"rNc" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -79858,7 +79853,7 @@ sAM
imH
evR
evR
rMN
afq
bCq
bUs
bLv
@@ -88522,13 +88517,13 @@ aoD
aod
aqe
arf
aqn
aad
ath
arf
auw
aeE
ath
arf
ayV
aeF
ath
dgz
aCd
@@ -90322,7 +90317,7 @@ cSA
aqe
arf
ari
asu
abz
aun
auW
avR
@@ -91350,7 +91345,7 @@ apr
aqj
arf
ark
asL
aeD
aun
avu
awt
@@ -96546,7 +96541,7 @@ bof
fTg
bLV
bNd
bOm
afn
bPp
bQF
bRN
@@ -98352,7 +98347,7 @@ bRQ
bOr
bSQ
bWj
bWk
afn
bXc
bYe
bNd
@@ -98866,7 +98861,7 @@ bRQ
bOr
bSQ
bWj
bWk
afn
bXc
bYe
bNd
+71 -76
View File
@@ -124,6 +124,22 @@
},
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"aaq" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/clown,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aar" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/mime,
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aas" = (
/obj/docking_port/stationary/random{
id = "pod_lavaland1";
@@ -143,6 +159,52 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/space,
/area/solar/starboard/fore)
"aav" = (
/obj/structure/bed,
/obj/machinery/light{
dir = 1
},
/obj/machinery/status_display{
pixel_y = 32
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aaw" = (
/obj/structure/bed,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aax" = (
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aay" = (
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"aaz" = (
/obj/structure/bed,
/obj/machinery/light,
/obj/machinery/status_display{
pixel_y = -32
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aaA" = (
/obj/structure/bed,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"aaE" = (
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -13706,14 +13768,6 @@
},
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aDF" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/rainbow,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aDG" = (
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
@@ -16868,14 +16922,6 @@
},
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aIP" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/orange,
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aIQ" = (
/obj/structure/dresser,
/turf/open/floor/wood{
@@ -78960,17 +79006,6 @@
/obj/structure/dresser,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"cCi" = (
/obj/structure/bed,
/obj/machinery/light{
dir = 1
},
/obj/item/bedsheet/red,
/obj/machinery/status_display{
pixel_y = 32
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"cCj" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket{
@@ -80988,24 +81023,10 @@
icon_state = "wood-broken2"
},
/area/crew_quarters/dorms)
"cFx" = (
/obj/structure/bed,
/obj/item/bedsheet/black,
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cFy" = (
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cFz" = (
/obj/structure/bed,
/obj/item/bedsheet/blue,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cFA" = (
/obj/structure/table/wood,
/obj/item/flashlight/lamp/green,
@@ -87802,11 +87823,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cRs" = (
/obj/structure/bed,
/obj/item/bedsheet/clown,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cRt" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
@@ -88880,11 +88896,6 @@
/obj/structure/chair/office/dark,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cTc" = (
/obj/structure/bed,
/obj/item/bedsheet/mime,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"cTd" = (
/obj/structure/table,
/obj/item/storage/fancy/donut_box,
@@ -90081,15 +90092,6 @@
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cUX" = (
/obj/structure/bed,
/obj/machinery/light,
/obj/item/bedsheet/brown,
/obj/machinery/status_display{
pixel_y = -32
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"cUY" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket{
@@ -127212,13 +127214,6 @@
dir = 1
},
/area/science/circuit)
"poI" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/item/tank/internals/anesthetic,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
"psi" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{
@@ -151685,7 +151680,7 @@ djm
fow
dod
dod
poI
aaA
dfY
ajr
aad
@@ -160839,11 +160834,11 @@ ary
aAf
aBu
aCB
aDF
aaq
aEJ
aFV
aDI
aIP
aar
aKo
aLE
aMX
@@ -178379,7 +178374,7 @@ cyY
cAx
cCd
cDD
cFx
aaw
cGU
cAw
cJl
@@ -178387,7 +178382,7 @@ cLa
cMx
cIi
cPR
cRs
aax
cDG
cUW
cAw
@@ -179160,7 +179155,7 @@ cNU
cDI
cFB
cDI
cUX
aaz
cAw
cYj
cZV
@@ -179407,7 +179402,7 @@ czc
cAw
cCg
cDG
cFz
aax
cGW
cIi
cJo
@@ -180176,7 +180171,7 @@ bHq
cxt
coI
cAw
cCi
aav
cDI
cFB
cDI
@@ -180444,7 +180439,7 @@ cMB
cIi
cPW
cRv
cTc
aay
cVb
cAw
cYp
+98 -98
View File
@@ -2,10 +2,58 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Cabin3";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aac" = (
/obj/effect/landmark/carpspawn,
/turf/open/space,
/area/space)
"aad" = (
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/button/door{
id = "Cabin4";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aae" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Cabin2";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aaf" = (
/obj/structure/lattice,
/turf/open/space,
@@ -252,6 +300,19 @@
},
/turf/open/floor/plating,
/area/security/prison)
"aaM" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Cabin5";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aaN" = (
/obj/structure/cable{
icon_state = "0-2"
@@ -294,6 +355,37 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
"aaU" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Cabin6";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aaV" = (
/obj/machinery/button/door{
id = "Cabin7";
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/structure/bed,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aaY" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -10141,22 +10233,6 @@
/obj/item/clothing/under/assistantformal,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asV" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/button/door{
id = "Cabin3";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"asW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -10195,23 +10271,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"ata" = (
/obj/machinery/light/small{
dir = 1
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/button/door{
id = "Cabin4";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/structure/bed,
/obj/item/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"atb" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/airalarm{
@@ -11892,21 +11951,6 @@
/obj/item/clothing/under/suit_jacket/tan,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"awE" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/button/door{
id = "Cabin2";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_x = 25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"awF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -11920,19 +11964,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"awG" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/button/door{
id = "Cabin5";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"awH" = (
/obj/machinery/newscaster{
pixel_y = 32
@@ -14983,22 +15014,6 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"aCJ" = (
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/button/door{
id = "Cabin6";
name = "Dorm Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aCK" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/airalarm{
@@ -17575,21 +17590,6 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms)
"aHS" = (
/obj/machinery/button/door{
id = "Cabin7";
name = "Door Bolt Control";
normaldoorcontrol = 1;
pixel_x = -25;
specialfunctions = 4
},
/obj/structure/bed,
/obj/item/bedsheet,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aHT" = (
/obj/structure/chair/wood/normal{
dir = 4
@@ -120053,10 +120053,10 @@ agz
aoV
dhs
arB
asV
aab
auf
arB
awE
aae
axE
arB
dhA
@@ -121595,19 +121595,19 @@ anK
aoZ
aqk
arB
ata
aad
aul
avp
awG
aaM
axJ
avp
aAj
arB
aCJ
aaU
aEe
arB
boS
aHS
aaV
aJh
aKt
aLW
+35 -35
View File
@@ -2,12 +2,44 @@
"aaa" = (
/turf/open/space/basic,
/area/space)
"aab" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Dorm3Shutters";
name = "Privacy Shutters Control";
pixel_y = 26
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aac" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Dorm2Shutters";
name = "Privacy Shutters Control";
pixel_y = 26;
req_access_txt = "0"
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"aad" = (
/obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
/area/maintenance/department/science)
"aae" = (
/obj/structure/bed,
/obj/machinery/button/door{
id = "Dorm1Shutters";
name = "Privacy Shutters Control";
pixel_y = 26;
req_access_txt = "0"
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"abf" = (
/obj/structure/bed,
/turf/open/floor/plating,
@@ -8605,16 +8637,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/dorms)
"ave" = (
/obj/structure/bed,
/obj/item/bedsheet/nanotrasen,
/obj/machinery/button/door{
id = "Dorm3Shutters";
name = "Privacy Shutters Control";
pixel_y = 26
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"avf" = (
/obj/machinery/light/small{
dir = 1
@@ -10058,17 +10080,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/dorms)
"ayj" = (
/obj/structure/bed,
/obj/item/bedsheet/nanotrasen,
/obj/machinery/button/door{
id = "Dorm2Shutters";
name = "Privacy Shutters Control";
pixel_y = 26;
req_access_txt = "0"
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"ayk" = (
/obj/machinery/light/small{
dir = 1
@@ -11516,17 +11527,6 @@
},
/turf/open/floor/plating,
/area/crew_quarters/dorms)
"aBM" = (
/obj/structure/bed,
/obj/item/bedsheet/nanotrasen,
/obj/machinery/button/door{
id = "Dorm1Shutters";
name = "Privacy Shutters Control";
pixel_y = 26;
req_access_txt = "0"
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"aBN" = (
/obj/machinery/light/small{
dir = 1
@@ -99272,13 +99272,13 @@ ale
asb
coe
apX
ave
aab
awn
apX
ayj
aac
azr
apX
aBM
aae
aDb
apX
oFo
+27 -24
View File
@@ -239,6 +239,23 @@
},
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"as" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/obj/item/bedsheet/pirate,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"at" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/bedsheet/pirate,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"au" = (
/obj/machinery/door/airlock/hatch{
id_tag = "piratebridgebolt";
@@ -314,6 +331,13 @@
},
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"aA" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
/obj/item/bedsheet/pirate,
/turf/open/floor/wood,
/area/shuttle/pirate)
"aB" = (
/obj/machinery/light/small{
dir = 4
@@ -408,12 +432,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/pirate)
"aM" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/wood,
/area/shuttle/pirate)
"aN" = (
/obj/machinery/light/small,
/obj/machinery/button/door{
@@ -1022,12 +1040,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/shuttle/pirate)
"mD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/shuttle/pirate)
"mU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/door/airlock/engineering{
@@ -1172,15 +1184,6 @@
},
/turf/open/floor/wood,
/area/shuttle/pirate)
"Ur" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel,
/area/shuttle/pirate)
(1,1,1) = {"
af
@@ -1231,7 +1234,7 @@ aq
ar
aj
RY
aM
aA
ep
aH
af
@@ -1406,9 +1409,9 @@ af
af
af
aj
mD
as
bB
Ur
at
aj
aj
aj
+80 -80
View File
@@ -1,7 +1,81 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aa" = (
/obj/structure/bed,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -26
},
/obj/item/bedsheet/pirate,
/turf/open/floor/plasteel/dark/side{
dir = 6
},
/area/shuttle/caravan/pirate)
"ab" = (
/obj/structure/chair/office/dark{
dir = 4
},
/obj/machinery/turretid{
icon_state = "control_kill";
lethal = 1;
locked = 0;
pixel_y = -30;
req_access = null
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/mob/living/simple_animal/hostile/pirate/ranged{
environment_smash = 0
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"ac" = (
/obj/structure/bed,
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = -24
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/item/bedsheet/pirate,
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"ad" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/pirate/ranged{
environment_smash = 0
},
/turf/open/floor/plasteel,
/area/shuttle/caravan/pirate)
"ae" = (
/obj/structure/rack,
/obj/item/storage/bag/money/vault,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/mob/living/simple_animal/parrot{
faction = list("pirate");
name = "Pegwing"
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"af" = (
/turf/closed/wall/mineral/plastitanium/nodiagonal,
/area/shuttle/caravan/pirate)
"ag" = (
/obj/machinery/light/small,
/obj/structure/bed,
/obj/item/bedsheet/pirate,
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"aE" = (
/obj/structure/closet{
name = "pirate outfits"
@@ -89,18 +163,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"fS" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = -24
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"fU" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/tile/red,
@@ -223,18 +285,6 @@
dir = 1
},
/area/shuttle/caravan/pirate)
"ku" = (
/obj/structure/rack,
/obj/item/storage/bag/money/vault,
/mob/living/simple_animal/parrot{
faction = list("pirate");
name = "Pegwing"
},
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"kY" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -502,13 +552,6 @@
/obj/item/reagent_containers/food/drinks/bottle/rum,
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"tM" = (
/mob/living/simple_animal/hostile/pirate/ranged{
environment_smash = 0
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/shuttle/caravan/pirate)
"ul" = (
/obj/structure/table,
/obj/item/retractor,
@@ -535,17 +578,6 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/shuttle/caravan/pirate)
"vq" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -26
},
/turf/open/floor/plasteel/dark/side{
dir = 6
},
/area/shuttle/caravan/pirate)
"vW" = (
/obj/machinery/light/small{
dir = 4
@@ -734,32 +766,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"EB" = (
/obj/structure/chair/office/dark{
dir = 4
},
/obj/machinery/turretid{
icon_state = "control_kill";
lethal = 1;
locked = 0;
pixel_y = -30;
req_access = null
},
/mob/living/simple_animal/hostile/pirate/ranged{
environment_smash = 0
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"EK" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -1018,12 +1024,6 @@
},
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"Wb" = (
/obj/machinery/light/small,
/obj/structure/bed,
/obj/item/bedsheet/brown,
/turf/open/floor/plasteel/dark,
/area/shuttle/caravan/pirate)
"Xq" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
@@ -1181,7 +1181,7 @@ su
Ag
af
jo
tM
ad
sr
af
af
@@ -1253,9 +1253,9 @@ Jv
af
aE
SF
vq
aa
NM
fS
ac
RC
oF
af
@@ -1272,7 +1272,7 @@ hZ
wZ
de
iF
Wb
ag
af
Jv
Jv
@@ -1286,7 +1286,7 @@ xg
qC
pK
Sk
ku
ae
af
qo
Jv
@@ -1374,7 +1374,7 @@ Jv
Jv
Bi
oO
EB
ab
bd
Bi
Jv
@@ -30,6 +30,18 @@
loot_spawned++
return INITIALIZE_HINT_QDEL
/obj/effect/spawner/lootdrop/bedsheet
icon = 'icons/obj/bedsheets.dmi'
icon_state = "random_bedsheet"
name = "random dorms 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 = 3, /obj/item/bedsheet/rainbow = 3,
/obj/item/bedsheet/ian = 3, /obj/item/bedsheet/runtime = 3, /obj/item/bedsheet/nanotrasen = 3,
/obj/item/bedsheet/pirate = 1, /obj/item/bedsheet/cosmos = 1, /obj/item/bedsheet/gondola = 1
)
/obj/effect/spawner/lootdrop/armory_contraband
name = "armory contraband gun spawner"
lootdoubles = FALSE
@@ -36,6 +36,7 @@ GLOBAL_LIST_INIT(human_recipes, list( \
GLOBAL_LIST_INIT(gondola_recipes, list ( \
new/datum/stack_recipe("gondola mask", /obj/item/clothing/mask/gondola, 1), \
new/datum/stack_recipe("gondola suit", /obj/item/clothing/under/gondola, 2), \
new/datum/stack_recipe("gondola bedsheet", /obj/item/bedsheet/gondola, 1), \
))
/obj/item/stack/sheet/animalhide/gondola
+33 -1
View File
@@ -225,6 +225,39 @@ LINEN BINS
item_color = "ian"
dream_messages = list("a dog", "a corgi", "woof", "bark", "arf")
/obj/item/bedsheet/runtime
icon_state = "sheetruntime"
item_color = "runtime"
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"
item_color = "black"
dream_messages = list("doing whatever oneself wants", "cause a pirate is free", "being a pirate", "stealing", "landlubbers", "gold", "a buried treasure", "yarr", "avast", "a swashbuckler", "sailing the Seven Seas", "a parrot", "a monkey", "an island", "a talking skull")
/obj/item/bedsheet/gondola
name = "gondola bedsheet"
desc = "A precious bedsheet made from the hide of a rare and peculiar critter."
icon_state = "sheetgondola"
item_color = "cargo"
var/g_mouth
var/g_eyes
/obj/item/bedsheet/gondola/Initialize()
. = ..()
g_mouth = "sheetgondola_mouth[rand(1, 4)]"
g_eyes = "sheetgondola_eyes[rand(1, 4)]"
add_overlay(g_mouth)
add_overlay(g_eyes)
/obj/item/bedsheet/gondola/worn_overlays(isinhands = FALSE, icon_file)
. = ..()
if(!isinhands)
. += mutable_appearance(icon_file, g_mouth)
. += mutable_appearance(icon_file, g_eyes)
/obj/item/bedsheet/cosmos
name = "cosmic space bedsheet"
desc = "Made from the dreams of those who wonder at the stars."
@@ -258,7 +291,6 @@ LINEN BINS
var/list/sheets = list()
var/obj/item/hidden = null
/obj/structure/bedsheetbin/examine(mob/user)
..()
if(amount < 1)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB