shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into job-menu-improvements

Browse Source
This commit is contained in:
Poojawa
2019-08-02 11:55:28 -05:00
committed by GitHub
parent 1893a8f319 753548946d
commit d0d6bc37a6
47 changed files with 712 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+119 -116
View File
@@ -41,24 +41,6 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/bar) /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" = ( "aae" = (
/obj/effect/landmark/carpspawn, /obj/effect/landmark/carpspawn,
/turf/open/space, /turf/open/space,
@@ -595,19 +577,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/security/execution/transfer) /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" = ( "abA" = (
/obj/machinery/light, /obj/machinery/light,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -2149,55 +2118,6 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/fore/secondary) /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" = ( "aeG" = (
/obj/structure/cable, /obj/structure/cable,
/obj/machinery/power/solar{ /obj/machinery/power/solar{
@@ -2574,11 +2494,6 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/main) /area/security/main)
"afn" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"afo" = ( "afo" = (
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
name = "Escape Pod Three" name = "Escape Pod Three"
@@ -2599,14 +2514,6 @@
}, },
/turf/open/space/basic, /turf/open/space/basic,
/area/space) /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" = ( "aft" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{ /obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 5 dir = 5
@@ -7503,6 +7410,24 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/fore/secondary) /area/maintenance/fore/secondary)
"aqn" = (
/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)
"aqo" = ( "aqo" = (
/obj/structure/chair/stool{ /obj/structure/chair/stool{
pixel_y = 8 pixel_y = 8
@@ -8283,6 +8208,19 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"asu" = (
/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)
"asv" = ( "asv" = (
/obj/structure/table, /obj/structure/table,
/obj/effect/spawner/lootdrop/maintenance{ /obj/effect/spawner/lootdrop/maintenance{
@@ -8374,6 +8312,19 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/port/fore) /area/maintenance/port/fore)
"asL" = (
/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)
"asM" = ( "asM" = (
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -8980,6 +8931,24 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"auw" = (
/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)
"aux" = ( "aux" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -10846,6 +10815,24 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ai_monitored/storage/eva) /area/ai_monitored/storage/eva)
"ayV" = (
/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)
"ayW" = ( "ayW" = (
/turf/closed/wall, /turf/closed/wall,
/area/ai_monitored/storage/eva) /area/ai_monitored/storage/eva)
@@ -31259,6 +31246,9 @@
/obj/effect/turf_decal/tile/brown{ /obj/effect/turf_decal/tile/brown{
dir = 8 dir = 8
}, },
/obj/machinery/keycard_auth{
pixel_y = 25
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/quartermaster/qm) /area/quartermaster/qm)
"bvH" = ( "bvH" = (
@@ -39377,6 +39367,11 @@
/obj/machinery/announcement_system, /obj/machinery/announcement_system,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tcommsat/computer) /area/tcommsat/computer)
"bOm" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
/turf/open/floor/plasteel/white,
/area/medical/virology)
"bOn" = ( "bOn" = (
/obj/machinery/light{ /obj/machinery/light{
dir = 1 dir = 1
@@ -56671,12 +56666,6 @@
/obj/item/stock_parts/cell/high, /obj/item/stock_parts/cell/high,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/circuit) /area/science/circuit)
"eef" = (
/obj/machinery/autolathe{
name = "public autolathe"
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"evR" = ( "evR" = (
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/bar) /area/maintenance/bar)
@@ -56912,6 +56901,12 @@
/obj/item/pen, /obj/item/pen,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/circuit) /area/science/circuit)
"ium" = (
/mob/living/simple_animal/bot/cleanbot{
name = "C.L.E.A.N."
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"izv" = ( "izv" = (
/obj/machinery/vending/clothing, /obj/machinery/vending/clothing,
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -57146,12 +57141,6 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/construction/mining/aux_base) /area/construction/mining/aux_base)
"lKX" = (
/mob/living/simple_animal/bot/cleanbot{
name = "C.L.E.A.N."
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"lMg" = ( "lMg" = (
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 9 dir = 9
@@ -57383,6 +57372,14 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/construction) /area/construction)
"rMN" = (
/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)
"rNc" = ( "rNc" = (
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 6 dir = 6
@@ -57594,6 +57591,12 @@
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/circuit) /area/science/circuit)
"urE" = (
/obj/machinery/autolathe{
name = "public autolathe"
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
"usO" = ( "usO" = (
/obj/machinery/vending/snack/random, /obj/machinery/vending/snack/random,
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -79853,7 +79856,7 @@ sAM
imH imH
evR evR
evR evR
afq rMN
bCq bCq
bUs bUs
bLv bLv
@@ -81615,7 +81618,7 @@ cNG
cNJ cNJ
bLF bLF
aZK aZK
eef urE
bbR bbR
bqt bqt
cBq cBq
@@ -88517,13 +88520,13 @@ aoD
aod aod
aqe aqe
arf arf
aad aqn
ath ath
arf arf
aeE auw
ath ath
arf arf
aeF ayV
ath ath
dgz dgz
aCd aCd
@@ -90317,7 +90320,7 @@ cSA
aqe aqe
arf arf
ari ari
abz asu
aun aun
auW auW
avR avR
@@ -91345,7 +91348,7 @@ apr
aqj aqj
arf arf
ark ark
aeD asL
aun aun
avu avu
awt awt
@@ -94210,7 +94213,7 @@ blm
bmL bmL
boi boi
bpw bpw
lKX ium
bsx bsx
btX btX
bvj bvj
@@ -96541,7 +96544,7 @@ bof
fTg fTg
bLV bLV
bNd bNd
afn bOm
bPp bPp
bQF bQF
bRN bRN
@@ -98347,7 +98350,7 @@ bRQ
bOr bOr
bSQ bSQ
bWj bWj
afn bOm
bXc bXc
bYe bYe
bNd bNd
@@ -98861,7 +98864,7 @@ bRQ
bOr bOr
bSQ bSQ
bWj bWj
afn bOm
bXc bXc
bYe bYe
bNd bNd
_maps/map_files/Deltastation/DeltaStation2.dmm
+76 -72
View File
@@ -124,22 +124,6 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den) /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" = ( "aas" = (
/obj/docking_port/stationary/random{ /obj/docking_port/stationary/random{
id = "pod_lavaland1"; id = "pod_lavaland1";
@@ -159,52 +143,6 @@
/obj/effect/landmark/xeno_spawn, /obj/effect/landmark/xeno_spawn,
/turf/open/space, /turf/open/space,
/area/solar/starboard/fore) /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" = ( "aaE" = (
/obj/structure/lattice/catwalk, /obj/structure/lattice/catwalk,
/turf/open/space, /turf/open/space,
@@ -1072,6 +1010,10 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"aez" = (
/obj/machinery/keycard_auth,
/turf/closed/wall,
/area/quartermaster/qm)
"aeB" = ( "aeB" = (
/obj/machinery/status_display, /obj/machinery/status_display,
/turf/closed/wall, /turf/closed/wall,
@@ -13768,6 +13710,14 @@
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service) /area/hallway/secondary/service)
"aDF" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/clown,
/turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service)
"aDG" = ( "aDG" = (
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/hallway/secondary/service) /area/hallway/secondary/service)
@@ -16922,6 +16872,14 @@
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
/area/hallway/secondary/service) /area/hallway/secondary/service)
"aIP" = (
/obj/structure/bed,
/obj/machinery/status_display{
pixel_y = 32
},
/obj/item/bedsheet/mime,
/turf/open/floor/wood,
/area/hallway/secondary/service)
"aIQ" = ( "aIQ" = (
/obj/structure/dresser, /obj/structure/dresser,
/turf/open/floor/wood{ /turf/open/floor/wood{
@@ -79006,6 +78964,17 @@
/obj/structure/dresser, /obj/structure/dresser,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"cCi" = (
/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)
"cCj" = ( "cCj" = (
/obj/structure/closet/secure_closet/personal/cabinet, /obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket{ /obj/item/clothing/suit/jacket{
@@ -81023,10 +80992,24 @@
icon_state = "wood-broken2" icon_state = "wood-broken2"
}, },
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"cFx" = (
/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)
"cFy" = ( "cFy" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"cFz" = (
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"cFA" = ( "cFA" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/flashlight/lamp/green, /obj/item/flashlight/lamp/green,
@@ -88896,6 +88879,11 @@
/obj/structure/chair/office/dark, /obj/structure/chair/office/dark,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"cTc" = (
/obj/structure/bed,
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"cTd" = ( "cTd" = (
/obj/structure/table, /obj/structure/table,
/obj/item/storage/fancy/donut_box, /obj/item/storage/fancy/donut_box,
@@ -90092,6 +90080,15 @@
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"cUX" = (
/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)
"cUY" = ( "cUY" = (
/obj/structure/closet/secure_closet/personal/cabinet, /obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/clothing/suit/jacket{ /obj/item/clothing/suit/jacket{
@@ -127214,6 +127211,13 @@
dir = 1 dir = 1
}, },
/area/science/circuit) /area/science/circuit)
"poI" = (
/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)
"psi" = ( "psi" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/structure/bodycontainer/morgue{ /obj/structure/bodycontainer/morgue{
@@ -151680,7 +151684,7 @@ djm
fow fow
dod dod
dod dod
aaA poI
dfY dfY
ajr ajr
aad aad
@@ -160834,11 +160838,11 @@ ary
aAf aAf
aBu aBu
aCB aCB
aaq aDF
aEJ aEJ
aFV aFV
aDI aDI
aar aIP
aKo aKo
aLE aLE
aMX aMX
@@ -174465,7 +174469,7 @@ aaa
aaa aaa
aad aad
aQQ aQQ
aQQ aez
aUp aUp
aVY aVY
aXE aXE
@@ -178374,7 +178378,7 @@ cyY
cAx cAx
cCd cCd
cDD cDD
aaw cFx
cGU cGU
cAw cAw
cJl cJl
@@ -178382,7 +178386,7 @@ cLa
cMx cMx
cIi cIi
cPR cPR
aax cFz
cDG cDG
cUW cUW
cAw cAw
@@ -179155,7 +179159,7 @@ cNU
cDI cDI
cFB cFB
cDI cDI
aaz cUX
cAw cAw
cYj cYj
cZV cZV
@@ -179402,7 +179406,7 @@ czc
cAw cAw
cCg cCg
cDG cDG
aax cFz
cGW cGW
cIi cIi
cJo cJo
@@ -180171,7 +180175,7 @@ bHq
cxt cxt
coI coI
cAw cAw
aav cCi
cDI cDI
cFB cFB
cDI cDI
@@ -180439,7 +180443,7 @@ cMB
cIi cIi
cPW cPW
cRv cRv
aay cTc
cVb cVb
cAw cAw
cYp cYp
_maps/map_files/MetaStation/MetaStation.dmm
+101 -98
View File
@@ -2,58 +2,10 @@
"aaa" = ( "aaa" = (
/turf/open/space/basic, /turf/open/space/basic,
/area/space) /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" = ( "aac" = (
/obj/effect/landmark/carpspawn, /obj/effect/landmark/carpspawn,
/turf/open/space, /turf/open/space,
/area/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" = ( "aaf" = (
/obj/structure/lattice, /obj/structure/lattice,
/turf/open/space, /turf/open/space,
@@ -300,19 +252,6 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/security/prison) /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" = ( "aaN" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-2" icon_state = "0-2"
@@ -355,37 +294,6 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/prison) /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" = ( "aaY" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
@@ -10233,6 +10141,22 @@
/obj/item/clothing/under/assistantformal, /obj/item/clothing/under/assistantformal,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"asV" = (
/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)
"asW" = ( "asW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
@@ -10271,6 +10195,23 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/dorms) /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/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"atb" = ( "atb" = (
/obj/structure/closet/secure_closet/personal/cabinet, /obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -11951,6 +11892,21 @@
/obj/item/clothing/under/suit_jacket/tan, /obj/item/clothing/under/suit_jacket/tan,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"awE" = (
/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)
"awF" = ( "awF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4 dir = 4
@@ -11964,6 +11920,19 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"awG" = (
/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)
"awH" = ( "awH" = (
/obj/machinery/newscaster{ /obj/machinery/newscaster{
pixel_y = 32 pixel_y = 32
@@ -15014,6 +14983,22 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"aCJ" = (
/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)
"aCK" = ( "aCK" = (
/obj/structure/closet/secure_closet/personal/cabinet, /obj/structure/closet/secure_closet/personal/cabinet,
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -17590,6 +17575,21 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms) /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/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/obj/effect/spawner/lootdrop/bedsheet,
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aHT" = ( "aHT" = (
/obj/structure/chair/wood/normal{ /obj/structure/chair/wood/normal{
dir = 4 dir = 4
@@ -20373,6 +20373,9 @@
/obj/effect/turf_decal/tile/brown{ /obj/effect/turf_decal/tile/brown{
dir = 4 dir = 4
}, },
/obj/machinery/keycard_auth{
pixel_y = 23
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/quartermaster/qm) /area/quartermaster/qm)
"aNS" = ( "aNS" = (
@@ -120053,10 +120056,10 @@ agz
aoV aoV
dhs dhs
arB arB
aab asV
auf auf
arB arB
aae awE
axE axE
arB arB
dhA dhA
@@ -121595,19 +121598,19 @@ anK
aoZ aoZ
aqk aqk
arB arB
aad ata
aul aul
avp avp
aaM awG
axJ axJ
avp avp
aAj aAj
arB arB
aaU aCJ
aEe aEe
arB arB
boS boS
aaV aHS
aJh aJh
aKt aKt
aLW aLW
_maps/map_files/PubbyStation/PubbyStation.dmm
+135 -131
View File
@@ -2,126 +2,12 @@
"aaa" = ( "aaa" = (
/turf/open/space/basic, /turf/open/space/basic,
/area/space) /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" = ( "aad" = (
/obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance,
/turf/open/floor/plating{ /turf/open/floor/plating{
icon_state = "platingdmg3" icon_state = "platingdmg3"
}, },
/area/maintenance/department/science) /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)
"aaf" = (
/obj/machinery/conveyor{
dir = 1;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aag" = (
/obj/machinery/mineral/stacking_unit_console{
dir = 2;
machinedir = 8;
pixel_x = -32;
pixel_y = 32
},
/obj/machinery/conveyor{
dir = 4;
id = "garbagestacked"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aah" = (
/obj/machinery/conveyor{
dir = 4;
id = "garbagestacked"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aai" = (
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/conveyor{
dir = 1;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aaj" = (
/obj/machinery/conveyor{
dir = 8;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aak" = (
/obj/machinery/recycler,
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aal" = (
/obj/structure/chair/comfy/black,
/obj/structure/sign/plaques/kiddie{
desc = "An embossed piece of paper from the Third University of Harvard.";
name = "\improper 'Diploma' frame";
pixel_y = 32
},
/obj/machinery/light/small{
dir = 1;
light_color = "#ffc1c1"
},
/obj/effect/landmark/start/lawyer,
/turf/open/floor/wood,
/area/lawoffice)
"aam" = (
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
},
/obj/structure/disposaloutlet{
dir = 4
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"abf" = ( "abf" = (
/obj/structure/bed, /obj/structure/bed,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -8719,6 +8605,16 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"ave" = (
/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)
"avf" = ( "avf" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 1 dir = 1
@@ -10162,6 +10058,17 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"ayj" = (
/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)
"ayk" = ( "ayk" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 1 dir = 1
@@ -11609,6 +11516,17 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"aBM" = (
/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)
"aBN" = ( "aBN" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 1 dir = 1
@@ -16769,6 +16687,13 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/disposal) /area/maintenance/disposal)
"aNV" = (
/obj/machinery/conveyor{
dir = 4;
id = "garbagestacked"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aNX" = ( "aNX" = (
/obj/machinery/disposal/deliveryChute{ /obj/machinery/disposal/deliveryChute{
dir = 8 dir = 8
@@ -17255,6 +17180,22 @@
/obj/item/shard, /obj/item/shard,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/cargo) /area/maintenance/department/cargo)
"aPg" = (
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
},
/obj/structure/disposaloutlet{
dir = 4
},
/obj/structure/disposalpipe/trunk{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aPi" = ( "aPi" = (
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
@@ -17620,6 +17561,16 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/disposal) /area/maintenance/disposal)
"aQo" = (
/obj/machinery/light/small{
dir = 8
},
/obj/machinery/conveyor{
dir = 1;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"aQp" = ( "aQp" = (
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -24159,6 +24110,10 @@
/obj/effect/turf_decal/tile/brown{ /obj/effect/turf_decal/tile/brown{
dir = 8 dir = 8
}, },
/obj/machinery/keycard_auth{
pixel_x = -23;
pixel_y = 0
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/quartermaster/qm) /area/quartermaster/qm)
"beK" = ( "beK" = (
@@ -51312,6 +51267,14 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/chapel/main/monastery) /area/chapel/main/monastery)
"cvf" = (
/obj/machinery/recycler,
/obj/machinery/conveyor{
dir = 4;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"cvg" = ( "cvg" = (
/obj/structure/flora/ausbushes/ywflowers, /obj/structure/flora/ausbushes/ywflowers,
/obj/structure/flora/ausbushes/brflowers, /obj/structure/flora/ausbushes/brflowers,
@@ -52118,6 +52081,13 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/library/lounge) /area/library/lounge)
"cyp" = (
/obj/machinery/conveyor{
dir = 8;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"cyy" = ( "cyy" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5 dir = 5
@@ -53734,6 +53704,19 @@
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/sleeper) /area/medical/sleeper)
"eFG" = (
/obj/machinery/mineral/stacking_unit_console{
dir = 2;
machinedir = 8;
pixel_x = -32;
pixel_y = 32
},
/obj/machinery/conveyor{
dir = 4;
id = "garbagestacked"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"eHI" = ( "eHI" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -61528,6 +61511,13 @@
/obj/structure/sign/warning/vacuum/external, /obj/structure/sign/warning/vacuum/external,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"xer" = (
/obj/machinery/conveyor{
dir = 1;
id = "garbage"
},
/turf/open/floor/plating,
/area/maintenance/disposal)
"xeB" = ( "xeB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
@@ -61781,6 +61771,20 @@
}, },
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/science/mixing) /area/science/mixing)
"xJy" = (
/obj/structure/chair/comfy/black,
/obj/structure/sign/plaques/kiddie{
desc = "An embossed piece of paper from the Third University of Harvard.";
name = "\improper 'Diploma' frame";
pixel_y = 32
},
/obj/machinery/light/small{
dir = 1;
light_color = "#ffc1c1"
},
/obj/effect/landmark/start/lawyer,
/turf/open/floor/wood,
/area/lawoffice)
"xKc" = ( "xKc" = (
/obj/structure/sign/warning/biohazard, /obj/structure/sign/warning/biohazard,
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
@@ -81803,7 +81807,7 @@ ajM
aiu aiu
aiu aiu
gSH gSH
aal xJy
sJr sJr
sJr sJr
sJr sJr
@@ -99272,13 +99276,13 @@ ale
asb asb
coe coe
apX apX
aab ave
awn awn
apX apX
aac ayj
azr azr
apX apX
aae aBM
aDb aDb
apX apX
oFo oFo
@@ -101105,7 +101109,7 @@ aTm
bbE bbE
bbE bbE
bbE bbE
dps bbE
bbE bbE
bbE bbE
aEj aEj
@@ -101364,7 +101368,7 @@ bcA
bdF bdF
beJ beJ
bfB bfB
bbE dps
aZv aZv
aUC aUC
biz biz
@@ -107513,9 +107517,9 @@ aaa
aaa aaa
aLn aLn
aNT aNT
aaf xer
aai aQo
aam aPg
aRu aRu
srZ srZ
aLm aLm
@@ -107771,7 +107775,7 @@ aaa
aLm aLm
aLm aLm
aNU aNU
aaj cyp
dqY dqY
aRv aRv
sZh sZh
@@ -108027,8 +108031,8 @@ aaa
aaa aaa
aLm aLm
aME aME
aag eFG
aaj cyp
dqY dqY
aRw aRw
sqQ sqQ
@@ -108284,9 +108288,9 @@ aaa
aaa aaa
aLo aLo
aMF aMF
aah aNV
aaj cyp
aak cvf
aQn aQn
sqQ sqQ
aSm aSm
@@ -108542,8 +108546,8 @@ aaa
aLo aLo
aMG aMG
aNX aNX
aaj cyp
aaf xer
aRy aRy
aSn aSn
aSn aSn
_maps/map_files/generic/CentCom.dmm
+40 -40
View File
@@ -2248,11 +2248,6 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/arena_source) /area/tdome/arena_source)
"fR" = (
/obj/item/paicard,
/obj/structure/table/wood,
/turf/open/floor/engine/cult,
/area/wizard_station)
"fS" = ( "fS" = (
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 8 dir = 8
@@ -2940,22 +2935,6 @@
/obj/machinery/capture_the_flag/red, /obj/machinery/capture_the_flag/red,
/turf/open/floor/circuit/green/anim, /turf/open/floor/circuit/green/anim,
/area/ctf) /area/ctf)
"hH" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/seclite,
/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
},
/obj/item/paicard,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"hI" = ( "hI" = (
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 10 dir = 10
@@ -3730,13 +3709,6 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"jA" = (
/obj/machinery/shower{
dir = 4
},
/obj/item/soap/syndie,
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"jB" = ( "jB" = (
/obj/structure/noticeboard{ /obj/structure/noticeboard{
dir = 8; dir = 8;
@@ -4222,14 +4194,6 @@
"ku" = ( "ku" = (
/turf/closed/indestructible/fakeglass, /turf/closed/indestructible/fakeglass,
/area/syndicate_mothership) /area/syndicate_mothership)
"kv" = (
/obj/structure/mirror{
pixel_x = -28
},
/obj/structure/table,
/obj/item/reagent_containers/rag/towel/syndicate,
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"kw" = ( "kw" = (
/turf/open/floor/plasteel/yellowsiding, /turf/open/floor/plasteel/yellowsiding,
/area/centcom/supply) /area/centcom/supply)
@@ -8429,6 +8393,13 @@
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/syndicate_mothership) /area/syndicate_mothership)
"tg" = (
/obj/machinery/shower{
dir = 4
},
/obj/item/soap/syndie,
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"tl" = ( "tl" = (
/obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/corner,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -11402,6 +11373,22 @@
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/centcom/ferry) /area/centcom/ferry)
"AL" = (
/obj/structure/table/reinforced,
/obj/item/flashlight/seclite,
/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
},
/obj/item/paicard,
/turf/open/floor/plasteel/dark,
/area/centcom/ferry)
"AM" = ( "AM" = (
/obj/machinery/shuttle_manipulator, /obj/machinery/shuttle_manipulator,
/turf/open/floor/circuit/green, /turf/open/floor/circuit/green,
@@ -11598,6 +11585,11 @@
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/centcom/holding) /area/centcom/holding)
"Bp" = (
/obj/item/paicard,
/obj/structure/table/wood,
/turf/open/floor/engine/cult,
/area/wizard_station)
"Bs" = ( "Bs" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/machinery/computer/libraryconsole/bookmanagement, /obj/machinery/computer/libraryconsole/bookmanagement,
@@ -17441,6 +17433,14 @@
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/centcom/holding) /area/centcom/holding)
"Rl" = (
/obj/structure/mirror{
pixel_x = -28
},
/obj/structure/table,
/obj/item/reagent_containers/rag/towel/syndicate,
/turf/open/floor/plasteel/freezer,
/area/syndicate_mothership)
"Rm" = ( "Rm" = (
/obj/structure/chair/wood/wings{ /obj/structure/chair/wood/wings{
dir = 3 dir = 3
@@ -25747,7 +25747,7 @@ lI
lI lI
lI lI
Ax Ax
fR Bp
qZ qZ
qZ qZ
Ax Ax
@@ -37828,8 +37828,8 @@ nx
mA mA
Tz Tz
ku ku
jA tg
kv Rl
uM uM
QV QV
wp wp
@@ -56343,7 +56343,7 @@ yr
sw sw
sw sw
Ad Ad
hH AL
Bx Bx
sw sw
Cv Cv
code/__DEFINES/melee.dm
+10
View File
@@ -0,0 +1,10 @@
//Martial arts defines
#define MARTIALART_BOXING "boxing"
#define MARTIALART_WRESTLING "wrestling"
#define MARTIALART_SLEEPINGCARP "sleeping carp"
#define MARTIALART_PSYCHOBRAWL "psychotic brawling"
#define MARTIALART_MUSHPUNCH "mushroom punch"
#define MARTIALART_KRAVMAGA "krav maga"
#define MARTIALART_CQC "CQC"
#define MARTIALART_PLASMAFIST "plasma fist"
code/datums/martial.dm
+1
View File
@@ -2,6 +2,7 @@
var/name = "Martial Art" var/name = "Martial Art"
var/streak = "" var/streak = ""
var/max_streak_length = 6 var/max_streak_length = 6
var/id = "" //ID, used by mind/has_martialartcode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proc
var/current_target var/current_target
var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
var/deflection_chance = 0 //Chance to deflect projectiles var/deflection_chance = 0 //Chance to deflect projectiles
code/datums/martial/boxing.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/martial_art/boxing /datum/martial_art/boxing
name = "Boxing" name = "Boxing"
id = MARTIALART_BOXING
/datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
to_chat(A, "<span class='warning'>Can't disarm while boxing!</span>") to_chat(A, "<span class='warning'>Can't disarm while boxing!</span>")
code/datums/martial/cqc.dm
+1
View File
@@ -6,6 +6,7 @@
/datum/martial_art/cqc /datum/martial_art/cqc
name = "CQC" name = "CQC"
id = MARTIALART_CQC
help_verb = /mob/living/carbon/human/proc/CQC_help help_verb = /mob/living/carbon/human/proc/CQC_help
block_chance = 75 block_chance = 75
var/just_a_cook = FALSE var/just_a_cook = FALSE
code/datums/martial/krav_maga.dm
+2 -1
View File
@@ -1,5 +1,6 @@
/datum/martial_art/krav_maga /datum/martial_art/krav_maga
name = "Krav Maga" name = "Krav Maga"
id = MARTIALART_KRAVMAGA
var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop() var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop()
var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep() var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep()
var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch() var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch()
@@ -92,7 +93,7 @@
"<span class='userdanger'>[A] leg sweeps you!</span>") "<span class='userdanger'>[A] leg sweeps you!</span>")
playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
D.apply_damage(5, BRUTE) D.apply_damage(5, BRUTE)
D.Knockdown(40, override_hardstun = 0.01, 25) D.Knockdown(40, override_hardstun = 0.01, override_stamdmg = 25)
log_combat(A, D, "leg sweeped") log_combat(A, D, "leg sweeped")
return 1 return 1
code/datums/martial/mushpunch.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/martial_art/mushpunch /datum/martial_art/mushpunch
name = "Mushroom Punch" name = "Mushroom Punch"
id = MARTIALART_MUSHPUNCH
/datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
var/atk_verb var/atk_verb
code/datums/martial/plasma_fist.dm
+1
View File
@@ -4,6 +4,7 @@
/datum/martial_art/plasma_fist /datum/martial_art/plasma_fist
name = "Plasma Fist" name = "Plasma Fist"
id = MARTIALART_PLASMAFIST
help_verb = /mob/living/carbon/human/proc/plasma_fist_help help_verb = /mob/living/carbon/human/proc/plasma_fist_help
code/datums/martial/psychotic_brawl.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/martial_art/psychotic_brawling /datum/martial_art/psychotic_brawling
name = "Psychotic Brawling" name = "Psychotic Brawling"
id = MARTIALART_PSYCHOBRAWL
/datum/martial_art/psychotic_brawling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) /datum/martial_art/psychotic_brawling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
return psycho_attack(A,D) return psycho_attack(A,D)
code/datums/martial/sleeping_carp.dm
+1
View File
@@ -6,6 +6,7 @@
/datum/martial_art/the_sleeping_carp /datum/martial_art/the_sleeping_carp
name = "The Sleeping Carp" name = "The Sleeping Carp"
id = MARTIALART_SLEEPINGCARP
deflection_chance = 100 deflection_chance = 100
reroute_deflection = TRUE reroute_deflection = TRUE
no_guns = TRUE no_guns = TRUE
code/datums/martial/wrestling.dm
+1
View File
@@ -10,6 +10,7 @@
/datum/martial_art/wrestling /datum/martial_art/wrestling
name = "Wrestling" name = "Wrestling"
id = MARTIALART_WRESTLING
var/datum/action/slam/slam = new/datum/action/slam() var/datum/action/slam/slam = new/datum/action/slam()
var/datum/action/throw_wrassle/throw_wrassle = new/datum/action/throw_wrassle() var/datum/action/throw_wrassle/throw_wrassle = new/datum/action/throw_wrassle()
var/datum/action/kick/kick = new/datum/action/kick() var/datum/action/kick/kick = new/datum/action/kick()
code/datums/mind.dm
+7
View File
@@ -64,6 +64,8 @@
var/force_escaped = FALSE // Set by Into The Sunset command of the shuttle manipulator var/force_escaped = FALSE // Set by Into The Sunset command of the shuttle manipulator
var/list/learned_recipes //List of learned recipe TYPES.
/datum/mind/New(var/key) /datum/mind/New(var/key)
src.key = key src.key = key
soulOwner = src soulOwner = src
@@ -779,6 +781,11 @@
mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist) mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist)
mind.active = 1 //indicates that the mind is currently synced with a client mind.active = 1 //indicates that the mind is currently synced with a client
/datum/mind/proc/has_martialart(var/string)
if(martial_art && martial_art.id == string)
return martial_art
return FALSE
/mob/dead/new_player/sync_mind() /mob/dead/new_player/sync_mind()
return return
code/game/objects/items/RPD.dm
+2
View File
@@ -177,6 +177,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
desc = "A device used to rapidly pipe things." desc = "A device used to rapidly pipe things."
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
icon_state = "rpd" icon_state = "rpd"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
flags_1 = CONDUCT_1 flags_1 = CONDUCT_1
force = 10 force = 10
throwforce = 10 throwforce = 10
code/game/objects/items/granters.dm
+96 -81
View File
@@ -1,4 +1,3 @@
///books that teach things (intrinsic actions like bar flinging, spells like fireball or smoke, or martial arts)/// ///books that teach things (intrinsic actions like bar flinging, spells like fireball or smoke, or martial arts)///
/obj/item/book/granter /obj/item/book/granter
@@ -13,19 +12,50 @@
/obj/item/book/granter/proc/turn_page(mob/user) /obj/item/book/granter/proc/turn_page(mob/user)
playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, 1) playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, 1)
if(do_after(user,50, user)) if(do_after(user,50, user))
to_chat(user, "<span class='notice'>[pick(remarks)]</span>") if(remarks.len)
to_chat(user, "<span class='notice'>[pick(remarks)]</span>")
else
to_chat(user, "<span class='notice'>You keep reading...</span>")
return TRUE return TRUE
return FALSE return FALSE
/obj/item/book/granter/proc/recoil(mob/user) //nothing so some books can just return /obj/item/book/granter/proc/recoil(mob/user) //nothing so some books can just return
/obj/item/book/granter/proc/already_known(mob/user)
return FALSE
/obj/item/book/granter/proc/on_reading_start(mob/user)
to_chat(user, "<span class='notice'>You start reading [name]...</span>")
/obj/item/book/granter/proc/on_reading_stopped(mob/user)
to_chat(user, "<span class='notice'>You stop reading...</span>")
/obj/item/book/granter/proc/on_reading_finished(mob/user)
to_chat(user, "<span class='notice'>You finish reading [name]!</span>")
/obj/item/book/granter/proc/onlearned(mob/user) /obj/item/book/granter/proc/onlearned(mob/user)
used = TRUE used = TRUE
/obj/item/book/granter/attack_self(mob/user) /obj/item/book/granter/attack_self(mob/user)
if(reading == TRUE) if(reading)
to_chat(user, "<span class='warning'>You're already reading this!</span>") to_chat(user, "<span class='warning'>You're already reading this!</span>")
return FALSE return FALSE
if(already_known(user))
return FALSE
if(used && oneuse)
recoil(user)
else
on_reading_start(user)
reading = TRUE
for(var/i=1, i<=pages_to_mastery, i++)
if(!turn_page(user))
on_reading_stopped()
reading = FALSE
return
if(do_after(user,50, user))
on_reading_finished(user)
reading = FALSE
return TRUE return TRUE
///ACTION BUTTONS/// ///ACTION BUTTONS///
@@ -34,33 +64,23 @@
var/granted_action var/granted_action
var/actionname = "catching bugs" //might not seem needed but this makes it so you can safely name action buttons toggle this or that without it fucking up the granter, also caps var/actionname = "catching bugs" //might not seem needed but this makes it so you can safely name action buttons toggle this or that without it fucking up the granter, also caps
/obj/item/book/granter/action/attack_self(mob/user) /obj/item/book/granter/action/already_known(mob/user)
. = ..()
if(!.)
return
if(!granted_action) if(!granted_action)
return return TRUE
var/datum/action/G = new granted_action
for(var/datum/action/A in user.actions) for(var/datum/action/A in user.actions)
if(A.type == G.type) if(A.type == granted_action)
to_chat(user, "<span class='notice'>You already know all about [actionname].</span>") to_chat(user, "<span class='notice'>You already know all about [actionname].</span>")
qdel(G) return TRUE
return return FALSE
if(used == TRUE && oneuse == TRUE)
recoil(user) /obj/item/book/granter/action/on_reading_start(mob/user)
else to_chat(user, "<span class='notice'>You start reading about [actionname]...</span>")
to_chat(user, "<span class='notice'>You start reading about [actionname]...</span>")
reading = TRUE /obj/item/book/granter/action/on_reading_finished(mob/user)
for(var/i=1, i<=pages_to_mastery, i++) to_chat(user, "<span class='notice'>You feel like you've got a good handle on [actionname]!</span>")
if(!turn_page(user)) var/datum/action/G = new granted_action
to_chat(user, "<span class='notice'>You stop reading...</span>") G.Grant(user)
reading = FALSE onlearned(user)
qdel(G)
return
if(do_after(user,50, user))
to_chat(user, "<span class='notice'>You feel like you've got a good handle on [actionname]!</span>")
G.Grant(user)
reading = FALSE
/obj/item/book/granter/action/drink_fling /obj/item/book/granter/action/drink_fling
granted_action = /datum/action/innate/drink_fling granted_action = /datum/action/innate/drink_fling
@@ -120,38 +140,28 @@
var/spell var/spell
var/spellname = "conjure bugs" var/spellname = "conjure bugs"
/obj/item/book/granter/spell/attack_self(mob/user) /obj/item/book/granter/spell/already_known(mob/user)
. = ..()
if(!.)
return
if(!spell) if(!spell)
return return TRUE
var/obj/effect/proc_holder/spell/S = new spell
for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
if(knownspell.type == S.type) if(knownspell.type == spell)
if(user.mind) if(user.mind)
if(iswizard(user)) if(iswizard(user))
to_chat(user,"<span class='notice'>You're already far more versed in this spell than this flimsy howto book can provide.</span>") to_chat(user,"<span class='notice'>You're already far more versed in this spell than this flimsy how-to book can provide.</span>")
else else
to_chat(user,"<span class='notice'>You've already read this one.</span>") to_chat(user,"<span class='notice'>You've already read this one.</span>")
return return TRUE
if(used == TRUE && oneuse == TRUE) return FALSE
recoil(user)
else /obj/item/book/granter/spell/on_reading_start(mob/user)
to_chat(user, "<span class='notice'>You start reading about casting [spellname]...</span>") to_chat(user, "<span class='notice'>You start reading about casting [spellname]...</span>")
reading = TRUE
for(var/i=1, i<=pages_to_mastery, i++) /obj/item/book/granter/spell/on_reading_finished(mob/user)
if(!turn_page(user)) to_chat(user, "<span class='notice'>You feel like you've experienced enough to cast [spellname]!</span>")
to_chat(user, "<span class='notice'>You stop reading...</span>") var/obj/effect/proc_holder/spell/S = new spell
reading = FALSE user.mind.AddSpell(S)
qdel(S) user.log_message("learned the spell [spellname] ([S])", LOG_ATTACK, color="orange")
return onlearned(user)
if(do_after(user,50, user))
to_chat(user, "<span class='notice'>You feel like you've experienced enough to cast [spellname]!</span>")
user.mind.AddSpell(S)
user.log_message("learned the spell [spellname] ([S])", LOG_ATTACK, color="orange")
onlearned(user)
reading = FALSE
/obj/item/book/granter/spell/recoil(mob/user) /obj/item/book/granter/spell/recoil(mob/user)
user.visible_message("<span class='warning'>[src] glows in a black light!</span>") user.visible_message("<span class='warning'>[src] glows in a black light!</span>")
@@ -280,7 +290,8 @@
if(ishuman(user)) if(ishuman(user))
to_chat(user,"<font size='15' color='red'><b>HORSIE HAS RISEN</b></font>") to_chat(user,"<font size='15' color='red'><b>HORSIE HAS RISEN</b></font>")
var/obj/item/clothing/magichead = new /obj/item/clothing/mask/horsehead/cursed(user.drop_location()) var/obj/item/clothing/magichead = new /obj/item/clothing/mask/horsehead/cursed(user.drop_location())
user.dropItemToGround(user.wear_mask, TRUE) if(!user.dropItemToGround(user.wear_mask))
qdel(user.wear_mask)
user.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, TRUE, TRUE) user.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, TRUE, TRUE)
qdel(src) qdel(src)
else else
@@ -327,35 +338,24 @@
var/martialname = "bug jitsu" var/martialname = "bug jitsu"
var/greet = "You feel like you have mastered the art in breaking code. Nice work, jackass." var/greet = "You feel like you have mastered the art in breaking code. Nice work, jackass."
/obj/item/book/granter/martial/attack_self(mob/user) /obj/item/book/granter/martial/already_known(mob/user)
. = ..()
if(!.)
return
if(!martial) if(!martial)
return return TRUE
var/datum/martial_art/MA = martial
if(user.mind.has_martialart(initial(MA.id)))
to_chat(user,"<span class='warning'>You already know [martialname]!</span>")
return TRUE
return FALSE
/obj/item/book/granter/martial/on_reading_start(mob/user)
to_chat(user, "<span class='notice'>You start reading about [martialname]...</span>")
/obj/item/book/granter/martial/on_reading_finished(mob/user)
to_chat(user, "[greet]")
var/datum/martial_art/MA = new martial var/datum/martial_art/MA = new martial
if(user.mind.martial_art) MA.teach(user)
for(var/datum/martial_art/knownmartial in user.mind.martial_art) user.log_message("learned the martial art [martialname] ([MA])", LOG_ATTACK, color="orange")
if(knownmartial.type == MA.type) onlearned(user)
to_chat(user,"<span class='warning'>You already know [martialname]!</span>")
return
if(used == TRUE && oneuse == TRUE)
recoil(user)
else
to_chat(user, "<span class='notice'>You start reading about [martialname]...</span>")
reading = TRUE
for(var/i=1, i<=pages_to_mastery, i++)
if(!turn_page(user))
to_chat(user, "<span class='notice'>You stop reading...</span>")
reading = FALSE
qdel(MA)
return
if(do_after(user,50, user))
to_chat(user, "[greet]")
MA.teach(user)
user.log_message("learned the martial art [martialname] ([MA])", LOG_ATTACK, color="orange")
onlearned(user)
reading = FALSE
/obj/item/book/granter/martial/cqc /obj/item/book/granter/martial/cqc
martial = /datum/martial_art/cqc martial = /datum/martial_art/cqc
@@ -416,3 +416,18 @@
icon_state = "blankscroll" icon_state = "blankscroll"
// I did not include mushpunch's grant, it is not a book and the item does it just fine. // I did not include mushpunch's grant, it is not a book and the item does it just fine.
//Crafting Recipe books
/obj/item/book/granter/crafting_recipe
var/list/crafting_recipe_types = list()
/obj/item/book/granter/crafting_recipe/on_reading_finished(mob/user)
. = ..()
if(!user.mind)
return
for(var/crafting_recipe_type in crafting_recipe_types)
var/datum/crafting_recipe/R = crafting_recipe_type
user.mind.teach_crafting_recipe(crafting_recipe_type)
to_chat(user,"<span class='notice'>You learned how to make [initial(R.name)].</span>")
code/game/objects/items/implants/implant_krav_maga.dm
+1 -1
View File
@@ -21,7 +21,7 @@
return return
if(!H.mind) if(!H.mind)
return return
if(istype(H.mind.martial_art, /datum/martial_art/krav_maga)) if(H.mind.has_martialart(MARTIALART_KRAVMAGA))
style.remove(H) style.remove(H)
else else
style.teach(H,1) style.teach(H,1)
code/game/objects/items/stacks/medical.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/obj/item/stack/medical/attack(mob/living/M, mob/user) /obj/item/stack/medical/attack(mob/living/M, mob/user)
if(M.stat == DEAD) if(M.stat == DEAD && !stop_bleeding)
var/t_him = "it" var/t_him = "it"
if(M.gender == MALE) if(M.gender == MALE)
t_him = "him" t_him = "him"
code/modules/antagonists/changeling/powers/tiny_prick.dm
+7 -8
View File
@@ -230,24 +230,23 @@
/obj/effect/proc_holder/changeling/sting/LSD /obj/effect/proc_holder/changeling/sting/LSD
name = "Hallucination Sting" name = "Hallucination Sting"
desc = "Causes terror in the target." desc = "Causes terror in the target and deals a minor amount of toxin damage."
helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect begins after a few seconds." helptext = "We evolve the ability to sting a target with a powerful toxic hallucinogenic chemical. The target does not notice they have been stung, and the effect begins instantaneously. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
sting_icon = "sting_lsd" sting_icon = "sting_lsd"
chemical_cost = 10 chemical_cost = 10
dna_cost = 1 dna_cost = 1
loudness = 1
action_icon = 'icons/mob/actions/actions_changeling.dmi' action_icon = 'icons/mob/actions/actions_changeling.dmi'
action_icon_state = "ling_sting_lsd" action_icon_state = "ling_sting_lsd"
action_background_icon_state = "bg_ling" action_background_icon_state = "bg_ling"
/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target) /obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/target)
log_combat(user, target, "stung", "LSD sting") log_combat(user, target, "stung", "LSD sting")
addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(100,200)) if(target.reagents)
target.reagents.add_reagent("regenerative_materia", 5)
target.reagents.add_reagent("mindbreaker", 5)
return TRUE return TRUE
/obj/effect/proc_holder/changeling/sting/LSD/proc/hallucination_time(mob/living/carbon/target)
if(target)
target.hallucination = max(90, target.hallucination)
/obj/effect/proc_holder/changeling/sting/cryo /obj/effect/proc_holder/changeling/sting/cryo
name = "Cryogenic Sting" name = "Cryogenic Sting"
desc = "We silently sting a human with a cocktail of chemicals that freeze them." desc = "We silently sting a human with a cocktail of chemicals that freeze them."
code/modules/crafting/craft.dm
+9
View File
@@ -317,6 +317,8 @@
var/list/cant_craft = list() var/list/cant_craft = list()
for(var/rec in GLOB.crafting_recipes) for(var/rec in GLOB.crafting_recipes)
var/datum/crafting_recipe/R = rec var/datum/crafting_recipe/R = rec
if(!R.always_availible && !(R.type in user?.mind?.learned_recipes)) //User doesn't actually know how to make this.
continue
if((R.category != cur_category) || (R.subcategory != cur_subcategory)) if((R.category != cur_category) || (R.subcategory != cur_subcategory))
continue continue
if(check_contents(R, surroundings)) if(check_contents(R, surroundings))
@@ -431,3 +433,10 @@
data["tool_text"] = tool_text data["tool_text"] = tool_text
return data return data
//Mind helpers
/datum/mind/proc/teach_crafting_recipe(R)
if(!learned_recipes)
learned_recipes = list()
learned_recipes |= R
code/modules/crafting/recipes.dm
+1
View File
@@ -9,6 +9,7 @@
var/chem_catalysts[] = list() //like tools but for reagents var/chem_catalysts[] = list() //like tools but for reagents
var/category = CAT_NONE //where it shows up in the crafting UI var/category = CAT_NONE //where it shows up in the crafting UI
var/subcategory = CAT_NONE var/subcategory = CAT_NONE
var/always_availible = TRUE //Set to FALSE if it needs to be learned first.
/datum/crafting_recipe/pin_removal /datum/crafting_recipe/pin_removal
name = "Pin Removal" name = "Pin Removal"
code/modules/food_and_drinks/food/snacks_cake.dm
+2 -2
View File
@@ -283,7 +283,7 @@
tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
foodtype = GRAIN | DAIRY | FRUIT | SUGAR foodtype = GRAIN | DAIRY | FRUIT | SUGAR
obj/item/reagent_containers/food/snacks/store/cake/holy_cake /obj/item/reagent_containers/food/snacks/store/cake/holy_cake
name = "angel food cake" name = "angel food cake"
desc = "A cake made for angels and chaplains alike! Contains holy water." desc = "A cake made for angels and chaplains alike! Contains holy water."
icon = 'modular_citadel/icons/obj/food/cake.dmi' icon = 'modular_citadel/icons/obj/food/cake.dmi'
@@ -322,7 +322,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake
tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
obj/item/reagent_containers/food/snacks/store/cake/hardware_cake /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
name = "hardware cake" name = "hardware cake"
desc = "A cake that is made with electronic boards and leaks acid..." desc = "A cake that is made with electronic boards and leaks acid..."
icon = 'modular_citadel/icons/obj/food/cake.dmi' icon = 'modular_citadel/icons/obj/food/cake.dmi'
code/modules/mob/dead/new_player/new_player.dm
+16 -2
View File
@@ -432,7 +432,21 @@
/mob/dead/new_player/proc/LateChoices() /mob/dead/new_player/proc/LateChoices()
var/list/dat = list("<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]</div>")
var/level = "green"
switch(GLOB.security_level)
if(SEC_LEVEL_GREEN)
level = "green"
if(SEC_LEVEL_BLUE)
level = "blue"
if(SEC_LEVEL_AMBER)
level = "amber"
if(SEC_LEVEL_RED)
level = "red"
if(SEC_LEVEL_DELTA)
level = "delta"
var/dat = "<div class='notice'>Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]<br>Alert Level: [capitalize(level)]</div>"
if(SSshuttle.emergency) if(SSshuttle.emergency)
switch(SSshuttle.emergency.mode) switch(SSshuttle.emergency.mode)
if(SHUTTLE_ESCAPE) if(SHUTTLE_ESCAPE)
@@ -601,4 +615,4 @@
message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.") message_admins("[src.ckey] just got booted back to lobby with no jobs enabled, but antag rolling enabled. Likely antag rolling abuse.")
return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well return FALSE //This is the only case someone should actually be completely blocked from antag rolling as well
return TRUE return TRUE
code/modules/mob/living/carbon/carbon.dm
+3 -2
View File
@@ -699,9 +699,10 @@
clear_fullscreen("critvision") clear_fullscreen("critvision")
//Oxygen damage overlay //Oxygen damage overlay
if(oxyloss) var/windedup = getOxyLoss() + getStaminaLoss() * 0.2 + stamdamageoverlaytemp
if(windedup)
var/severity = 0 var/severity = 0
switch(oxyloss) switch(windedup)
if(10 to 20) if(10 to 20)
severity = 1 severity = 1
if(20 to 25) if(20 to 25)
code/modules/mob/living/carbon/carbon_defines.dm
+1
View File
@@ -61,5 +61,6 @@
var/next_hallucination = 0 var/next_hallucination = 0
var/cpr_time = 1 //CPR cooldown. var/cpr_time = 1 //CPR cooldown.
var/damageoverlaytemp = 0 var/damageoverlaytemp = 0
var/stamdamageoverlaytemp = 0
var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects
code/modules/mob/living/carbon/human/species.dm
+1
View File
@@ -1781,6 +1781,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(CLONE) if(CLONE)
H.adjustCloneLoss(damage * hit_percent * H.physiology.clone_mod) H.adjustCloneLoss(damage * hit_percent * H.physiology.clone_mod)
if(STAMINA) if(STAMINA)
H.stamdamageoverlaytemp = 20
if(BP) if(BP)
if(damage > 0 ? BP.receive_damage(0, 0, damage * hit_percent * H.physiology.stamina_mod) : BP.heal_damage(0, 0, abs(damage * hit_percent * H.physiology.stamina_mod), only_robotic = FALSE, only_organic = FALSE)) if(damage > 0 ? BP.receive_damage(0, 0, damage * hit_percent * H.physiology.stamina_mod) : BP.heal_damage(0, 0, abs(damage * hit_percent * H.physiology.stamina_mod), only_robotic = FALSE, only_organic = FALSE))
H.update_stamina() H.update_stamina()
code/modules/mob/living/carbon/life.dm
+2 -1
View File
@@ -4,8 +4,9 @@
if(notransform) if(notransform)
return return
if(damageoverlaytemp) if(damageoverlaytemp || stamdamageoverlaytemp)
damageoverlaytemp = 0 damageoverlaytemp = 0
stamdamageoverlaytemp = 0
update_damage_hud() update_damage_hud()
if(stat != DEAD) //Reagent processing needs to come before breathing, to prevent edge cases. if(stat != DEAD) //Reagent processing needs to come before breathing, to prevent edge cases.
code/modules/projectiles/ammunition/energy/special.dm
+5
View File
@@ -62,3 +62,8 @@
e_cost = 200 e_cost = 200
select_name = "stun" select_name = "stun"
projectile_type = /obj/item/projectile/energy/tesla/revolver projectile_type = /obj/item/projectile/energy/tesla/revolver
/obj/item/ammo_casing/energy/emitter
fire_sound = 'sound/weapons/emitter.ogg'
e_cost = 2000 //20,000 is in the cell making this 10 shots before reload
projectile_type = /obj/item/projectile/beam/emitter
code/modules/projectiles/guns/energy/special.dm
+19
View File
@@ -304,3 +304,22 @@
/obj/item/gun/energy/gravity_gun/security /obj/item/gun/energy/gravity_gun/security
pin = /obj/item/firing_pin pin = /obj/item/firing_pin
//Emitter Gun
/obj/item/gun/energy/emitter
name = "Emitter Carbine"
desc = "A small emitter fitted into a handgun case, do to size constraints and safety it can only shoot about ten times when fully charged."
icon_state = "emitter_carbine"
force = 12
w_class = WEIGHT_CLASS_SMALL
cell_type = /obj/item/stock_parts/cell/super
ammo_type = list(/obj/item/ammo_casing/energy/emitter)
/obj/item/gun/energy/emitter/update_icon()
..()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
if(!QDELETED(cell) && (cell.charge > shot.e_cost))
add_overlay("emitter_carbine_empty")
else
add_overlay("emitter_carbine")
code/modules/uplink/uplink_items.dm
+9 -2
View File
@@ -414,8 +414,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/rapier /datum/uplink_item/dangerous/rapier
name = "Rapier" name = "Rapier"
desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \ desc = "A fancy rapier with a diamond tip piercing anything that it comes into contack with. \
The rapier comes with its own shielf, this is rather noticeable as only the captain is known to carry a shielf. \ The rapier comes with its own sheath, this is rather noticeable as only the captain is known to carry a sheath. \
The shielf itself can be used to block melee attacks only. Its also jet black colours." The sheath itself can be used to block melee attacks only. Its also jet black colours."
item = /obj/item/storage/belt/sabre/rapier item = /obj/item/storage/belt/sabre/rapier
cost = 8 cost = 8
exclude_modes = list(/datum/game_mode/nuclear/clown_ops) exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -1837,6 +1837,13 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
item = /obj/item/clothing/shoes/clown_shoes/taeclowndo item = /obj/item/clothing/shoes/clown_shoes/taeclowndo
restricted_roles = list("Clown") restricted_roles = list("Clown")
/datum/uplink_item/role_restricted/emitter_cannon
name = "Emitter Cannon"
desc = "A small emitter fitted into a gun case, do to size constraints and safety it can only shoot about ten times when fully charged."
cost = 5 //Low ammo, and deals same as 10mm but emp-able
item = /obj/item/gun/energy/emitter
restricted_roles = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
// Pointless // Pointless
/datum/uplink_item/badass /datum/uplink_item/badass
category = "(Pointless) Badassery" category = "(Pointless) Badassery"
html/changelogs/AutoChangeLog-pr-8953.yml
+5
View File
@@ -0,0 +1,5 @@
author: "Toriate"
delete-after: True
changes:
- rscadd: "RPD now has inhands"
- imageadd: "New sprites for RCDs and RPDs, inhands included"
html/changelogs/AutoChangeLog-pr-8958.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- rscadd: "Emitter gun"
html/changelogs/AutoChangeLog-pr-8988.yml
+5
View File
@@ -0,0 +1,5 @@
author: "kiwedespars"
delete-after: True
changes:
- rscadd: "regenerative materia to hallucination sting"
- rscadd: "mindbreaker toxin as an actual chemical to hallucination sting"
html/changelogs/AutoChangeLog-pr-8994.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Ghommie"
delete-after: True
changes:
- tweak: "the oxyloss fullscreen overlays now also take in consideration 1/5 of the user stamina loss."
html/changelogs/AutoChangeLog-pr-9000.yml
+4
View File
@@ -0,0 +1,4 @@
author: "EgoSumStultus"
delete-after: True
changes:
- bugfix: "FIXED SHIELF"
html/changelogs/AutoChangeLog-pr-9001.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Linzolle"
delete-after: True
changes:
- rscdel: "duplicate definition of hos and sec skirts"
html/changelogs/AutoChangeLog-pr-9005.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- bugfix: "QM rooms not getting Key Aunths"
html/changelogs/AutoChangeLog-pr-9008.yml
+4
View File
@@ -0,0 +1,4 @@
author: "Linzolle"
delete-after: True
changes:
- bugfix: "Krav Maga leg sweep now works properly."
html/changelogs/AutoChangeLog-pr-9026.yml
+4
View File
@@ -0,0 +1,4 @@
author: "BurgerBB"
delete-after: True
changes:
- rscadd: "The alert level is displayed at the job selection screen."
icons/mob/inhands/equipment/tools_lefthand.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

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

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

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

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 37 KiB

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

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 23 KiB

modular_citadel/code/modules/clothing/under/under.dm
-20
View File
@@ -5,26 +5,6 @@
*////////////////////////////////////////////////////////////////////////////////// *//////////////////////////////////////////////////////////////////////////////////
/obj/item/clothing/under/rank/security/skirt
name = "security skirt"
desc = "A tactical security skirt for officers complete with Nanotrasen belt buckle."
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "secskirt"
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "r_suit"
item_color = "secskirt"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/rank/head_of_security/skirt
name = "head of security's skirt"
desc = "A security skirt decorated for those few with the dedication to achieve the position of Head of Security."
icon = 'modular_citadel/icons/obj/clothing/cit_clothes.dmi'
icon_state = "hosskirt"
alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
item_state = "gy_suit"
item_color = "hosskirt"
body_parts_covered = CHEST|GROIN|ARMS
/obj/item/clothing/under/corporateuniform /obj/item/clothing/under/corporateuniform
name = "corporate uniform" name = "corporate uniform"
desc = "A comfortable, tight fitting jumpsuit made of premium materials. Not space-proof." desc = "A comfortable, tight fitting jumpsuit made of premium materials. Not space-proof."
tgstation.dme
+1
View File
@@ -62,6 +62,7 @@
#include "code\__DEFINES\maths.dm" #include "code\__DEFINES\maths.dm"
#include "code\__DEFINES\MC.dm" #include "code\__DEFINES\MC.dm"
#include "code\__DEFINES\medal.dm" #include "code\__DEFINES\medal.dm"
#include "code\__DEFINES\melee.dm"
#include "code\__DEFINES\menu.dm" #include "code\__DEFINES\menu.dm"
#include "code\__DEFINES\misc.dm" #include "code\__DEFINES\misc.dm"
#include "code\__DEFINES\mobs.dm" #include "code\__DEFINES\mobs.dm"