fixes brain_damage_lines.json compile errors

This commit is contained in:
deathride58
2017-12-15 12:57:29 -05:00
committed by kevinz000
parent 253c819bc1
commit b1efb191bc
12 changed files with 4823 additions and 2074 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
## /tg/station codebase
## Citadel Station 13 codebase
[![Build Status](https://travis-ci.org/tgstation/tgstation.png)](https://travis-ci.org/tgstation/tgstation) [![Krihelimeter](https://www.krihelinator.xyz/badge/tgstation/tgstation)](https://www.krihelinator.xyz)
[![Percentage of issues still open](https://isitmaintained.com/badge/open/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Percentage of issues still open") [![Average time to resolve an issue](https://isitmaintained.com/badge/resolution/tgstation/tgstation.svg)](https://isitmaintained.com/project/tgstation/tgstation "Average time to resolve an issue") ![Coverage](https://img.shields.io/badge/coverage---2%25-red.svg)
File diff suppressed because it is too large Load Diff
+109 -122
View File
@@ -17251,16 +17251,16 @@
/obj/machinery/newscaster{
pixel_x = -32
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aKz" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aKA" = (
/obj/structure/chair/stool/bar,
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aKB" = (
/obj/structure/chair/stool/bar,
@@ -17268,7 +17268,7 @@
name = "Station Intercom";
pixel_x = 26
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aKC" = (
/turf/closed/wall,
@@ -17824,10 +17824,10 @@
/obj/structure/extinguisher_cabinet{
pixel_x = -26
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aLL" = (
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aLM" = (
/obj/machinery/airalarm{
@@ -17837,7 +17837,7 @@
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aLN" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -18478,15 +18478,15 @@
/area/crew_quarters/bar/atrium)
"aNg" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aNh" = (
/obj/structure/chair/stool,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aNi" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aNj" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -19173,12 +19173,12 @@
"aOI" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aOJ" = (
/obj/structure/table/wood,
/obj/item/storage/pill_bottle/dice,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aOK" = (
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -19189,12 +19189,12 @@
pixel_x = -8
},
/obj/structure/table/wood,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aOL" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/cola,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aOM" = (
/obj/structure/table,
@@ -19964,7 +19964,7 @@
dir = 5
},
/obj/structure/chair/stool,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQs" = (
/obj/structure/table/wood,
@@ -19972,7 +19972,7 @@
dir = 4
},
/obj/item/reagent_containers/food/drinks/bottle/orangejuice,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQt" = (
/obj/structure/table/wood,
@@ -19980,7 +19980,7 @@
dir = 4
},
/obj/item/reagent_containers/food/snacks/cheesiehonkers,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQu" = (
/obj/structure/table/wood,
@@ -19988,20 +19988,20 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQv" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aQx" = (
/obj/machinery/door/firedoor,
@@ -20825,7 +20825,7 @@
/area/crew_quarters/bar/atrium)
"aSb" = (
/obj/effect/landmark/lightsout,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aSc" = (
/obj/machinery/door/firedoor,
@@ -21708,30 +21708,30 @@
"aTH" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/coffee,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aTI" = (
/obj/structure/table/wood,
/obj/item/device/paicard,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aTJ" = (
/obj/structure/table/wood,
/obj/item/clothing/head/hardhat/cakehat,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aTK" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aTL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aTM" = (
/obj/machinery/door/firedoor,
@@ -22568,27 +22568,27 @@
"aVq" = (
/obj/structure/chair/stool,
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aVr" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/chips,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aVs" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aVt" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/britcup,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aVu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/chair/stool,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aVv" = (
/obj/structure/cable/white{
@@ -23469,13 +23469,13 @@
pixel_x = -26;
pixel_y = -26
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aXc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aXd" = (
/obj/structure/cable/white{
@@ -24232,7 +24232,7 @@
dir = 4;
name = "service camera"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aYF" = (
/obj/machinery/firealarm{
@@ -24242,7 +24242,7 @@
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aYG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -25200,21 +25200,21 @@
pixel_x = -32
},
/obj/item/twohanded/required/kirbyplants/random,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"baE" = (
/obj/structure/chair/stool/bar,
/obj/structure/disposalpipe/segment{
dir = 6
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"baF" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
dir = 8
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"baG" = (
/obj/structure/extinguisher_cabinet{
@@ -33371,7 +33371,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -34463,7 +34463,7 @@
/area/security/main)
"btw" = (
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35149,7 +35149,7 @@
/obj/machinery/light/small{
dir = 4
},
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -35781,7 +35781,7 @@
pixel_x = 32
},
/obj/effect/landmark/secequipment,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -42973,18 +42973,12 @@
/turf/open/floor/plating,
/area/security/brig)
"bJt" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/red/side{
dir = 8
},
/area/security/brig)
"bJu" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -42996,9 +42990,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/door/window/brigdoor/security/cell/westright{
id = "brig1";
name = "Cell 1"
@@ -46763,9 +46754,6 @@
},
/area/security/detectives_office)
"bRo" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -46777,9 +46765,6 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/door/window/brigdoor/security/cell/westright{
id = "brig2";
name = "Cell 2"
@@ -54050,9 +54035,6 @@
},
/area/security/brig)
"cfd" = (
/obj/machinery/computer/secure_data{
dir = 8
},
/obj/structure/cable/white{
icon_state = "1-2"
},
@@ -54924,15 +54906,15 @@
/turf/open/floor/wood,
/area/lawoffice)
"cgP" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/table/reinforced,
/obj/machinery/newscaster/security_unit{
pixel_x = -32
},
/obj/item/clipboard,
/obj/item/toy/figure/secofficer,
/obj/machinery/computer/secure_data{
dir = 4
},
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel/red/side{
dir = 8
},
@@ -54941,16 +54923,21 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 5
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/neutral,
/area/security/brig)
"cgR" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/filingcabinet/chestdrawer,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/red/side{
dir = 4
},
@@ -54959,15 +54946,16 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/red/corner{
dir = 1
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/security/brig)
"cgT" = (
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/security/brig)
"cgU" = (
@@ -55756,9 +55744,6 @@
/turf/open/floor/wood,
/area/lawoffice)
"ciz" = (
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/structure/table/reinforced,
/obj/item/paper_bin,
/obj/machinery/light/small{
@@ -55773,9 +55758,6 @@
},
/area/security/brig)
"ciA" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/structure/sign/nanotrasen{
pixel_y = -32
},
@@ -55787,57 +55769,38 @@
dir = 1;
name = "security camera"
},
/obj/structure/table/reinforced,
/obj/item/clipboard,
/obj/item/toy/figure/secofficer,
/turf/open/floor/plasteel/red/side,
/area/security/brig)
"ciB" = (
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/structure/extinguisher_cabinet{
pixel_y = -26
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/filingcabinet/chestdrawer,
/turf/open/floor/plasteel/red/side{
dir = 6
},
/area/security/brig)
"ciC" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
name = "Security Desk";
req_access_txt = "63"
},
/obj/structure/cable/white{
icon_state = "1-4"
},
/obj/structure/cable/white{
icon_state = "4-8"
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/closed/wall,
/area/security/brig)
"ciD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/red/side{
dir = 8
dir = 10
},
/area/security/brig)
"ciD" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/red/corner,
/area/security/brig)
"ciE" = (
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/structure/chair{
dir = 1
},
@@ -95375,7 +95338,7 @@
dir = 1;
pixel_y = -22
},
/obj/item/twohanded/required/kirbyplants/random,
/obj/machinery/vending/kink,
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
@@ -105063,6 +105026,30 @@
},
/turf/open/floor/plasteel/dark,
/area/library)
"ehQ" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"ehR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
name = "Security Desk";
req_access_txt = "63"
},
/turf/open/floor/plasteel/red/side{
dir = 8
},
/area/security/brig)
"ehS" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/crew_quarters/abandoned_gambling_den)
(1,1,1) = {"
aaa
@@ -129398,7 +129385,7 @@ dry
dta
duk
dvY
dod
ehS
dmi
dfY
aad
@@ -135469,7 +135456,7 @@ alf
avr
awp
axK
alg
ehQ
aAb
aBk
aCv
@@ -155040,20 +155027,20 @@ bAi
bCa
bDZ
bnG
bHw
bJs
bLk
bgZ
bHw
bJs
bLk
bgZ
bgZ
bgZ
bgZ
bgZ
bgZ
bgZ
bXB
bZK
cbw
bgZ
bgZ
bHz
bNj
ehR
ciC
bgZ
clx
@@ -155559,7 +155546,7 @@ bJu
bLm
bEe
bPp
bmj
bkq
bTb
bNj
bXD
+78 -110
View File
@@ -4648,9 +4648,7 @@
/area/engine/gravity_generator)
"aka" = (
/obj/effect/turf_decal/bot_white/right,
/turf/open/floor/plasteel/vault{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"akb" = (
/obj/structure/sign/securearea{
@@ -4660,15 +4658,11 @@
pixel_y = 32
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"akc" = (
/obj/effect/turf_decal/bot_white/left,
/turf/open/floor/plasteel/vault{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"akd" = (
/turf/open/space,
@@ -5348,9 +5342,7 @@
/area/engine/gravity_generator)
"alt" = (
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"alu" = (
/obj/machinery/light{
@@ -6028,25 +6020,19 @@
dir = 10
},
/obj/effect/turf_decal/bot_white/left,
/turf/open/floor/plasteel/vault{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"amK" = (
/obj/machinery/gravity_generator/main/station,
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"amL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/effect/turf_decal/bot_white/right,
/turf/open/floor/plasteel/vault{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/engine/gravity_generator)
"amM" = (
/obj/machinery/camera{
@@ -11686,9 +11672,6 @@
/turf/open/floor/plating,
/area/security/brig)
"ayx" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
@@ -11712,9 +11695,6 @@
/turf/open/floor/plating,
/area/security/brig)
"ayz" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
@@ -11728,9 +11708,6 @@
/turf/open/floor/plasteel/red/side,
/area/security/brig)
"ayA" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
@@ -12229,9 +12206,6 @@
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
"azE" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
"azF" = (
@@ -13041,15 +13015,18 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
"aBh" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
"aBi" = (
@@ -13662,19 +13639,8 @@
},
/area/security/brig)
"aCq" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
name = "Security Desk";
req_access_txt = "63"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/turf/open/floor/plasteel/dark,
/turf/closed/wall,
/area/security/brig)
"aCr" = (
/obj/machinery/door/airlock/security{
@@ -14158,12 +14124,6 @@
},
/area/hallway/primary/fore)
"aDz" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'HIGH VOLTAGE'";
icon_state = "shock";
name = "HIGH VOLTAGE";
pixel_y = 32
},
/obj/machinery/camera{
c_tag = "Fore Primary Hallway Cells";
dir = 2;
@@ -14214,7 +14174,6 @@
/turf/open/floor/plating,
/area/security/brig)
"aDF" = (
/obj/machinery/computer/secure_data,
/obj/machinery/button/flasher{
id = "secentranceflasher";
name = "Brig Entrance Flash Control";
@@ -14262,16 +14221,13 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aDG" = (
/obj/structure/filingcabinet/chestdrawer{
pixel_y = 3
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aDH" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aDH" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
@@ -14294,6 +14250,9 @@
pixel_x = 29;
pixel_y = -2
},
/obj/structure/filingcabinet/chestdrawer{
pixel_y = 3
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aDI" = (
@@ -14958,18 +14917,15 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aEX" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aEY" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
@@ -14977,6 +14933,15 @@
/obj/machinery/light/small{
dir = 4
},
/obj/structure/table,
/obj/item/folder/red{
pixel_x = 3
},
/obj/item/folder/white{
pixel_x = -4;
pixel_y = 2
},
/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aEZ" = (
@@ -15680,14 +15645,6 @@
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aGr" = (
/obj/structure/table,
/obj/item/folder/red{
pixel_x = 3
},
/obj/item/folder/white{
pixel_x = -4;
pixel_y = 2
},
/obj/machinery/computer/security/telescreen{
desc = "Used for watching Prison Wing holding areas.";
dir = 1;
@@ -15695,7 +15652,9 @@
network = list("Prison");
pixel_y = -30
},
/obj/item/restraints/handcuffs,
/obj/machinery/computer/secure_data{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aGs" = (
@@ -26339,7 +26298,7 @@
},
/area/security/checkpoint/engineering)
"bcO" = (
/obj/structure/easel,
/obj/machinery/vending/kink,
/turf/open/floor/plating{
icon_state = "platingdmg3"
},
@@ -42512,7 +42471,7 @@
},
/obj/effect/turf_decal/bot_white/right,
/turf/open/floor/plasteel/vault{
dir = 1
dir = 4
},
/area/gateway)
"bJZ" = (
@@ -42524,7 +42483,7 @@
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
dir = 4
},
/area/gateway)
"bKa" = (
@@ -43234,12 +43193,14 @@
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
dir = 4
},
/area/gateway)
"bLE" = (
/obj/machinery/gateway/centerstation,
/turf/open/floor/plasteel/dark,
/turf/open/floor/plasteel/vault{
dir = 4
},
/area/gateway)
"bLF" = (
/obj/machinery/gateway{
@@ -43247,7 +43208,7 @@
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
dir = 4
},
/area/gateway)
"bLG" = (
@@ -44123,7 +44084,7 @@
},
/obj/effect/turf_decal/bot_white,
/turf/open/floor/plasteel/vault{
dir = 8
dir = 4
},
/area/gateway)
"bNr" = (
@@ -44132,7 +44093,7 @@
},
/obj/effect/turf_decal/bot_white/right,
/turf/open/floor/plasteel/vault{
dir = 1
dir = 4
},
/area/gateway)
"bNs" = (
@@ -44738,20 +44699,26 @@
/turf/open/floor/plating,
/area/gateway)
"bOK" = (
/turf/open/floor/plasteel/vault,
/turf/open/floor/plasteel/vault{
dir = 4
},
/area/gateway)
"bOL" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/vault,
/turf/open/floor/plasteel/vault{
dir = 4
},
/area/gateway)
"bOM" = (
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel/vault,
/turf/open/floor/plasteel/vault{
dir = 4
},
/area/gateway)
"bON" = (
/obj/structure/sign/securearea{
@@ -59673,10 +59640,10 @@
/turf/open/space,
/area/space/nearstation)
"ctn" = (
/obj/machinery/vending/cigarette,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/port/aft)
"cto" = (
@@ -75728,7 +75695,7 @@
/turf/open/floor/plating,
/area/maintenance/port)
"dbl" = (
/obj/structure/easel,
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"dbm" = (
@@ -79959,12 +79926,16 @@
/turf/open/floor/plating,
/area/security/brig)
"dBH" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/yellow{
icon_state = "0-4"
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
name = "Security Desk";
req_access_txt = "63"
},
/turf/open/floor/plating,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
"dBI" = (
/obj/effect/spawner/structure/window/reinforced,
@@ -80116,9 +80087,6 @@
},
/area/maintenance/starboard/fore)
"dCj" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/floorgrime,
/area/security/brig)
@@ -105605,7 +105573,7 @@ awZ
ayw
azD
aAY
aCk
ajm
aDw
aDC
aGb
@@ -105862,8 +105830,8 @@ axa
ayx
azE
azE
aCl
aDx
ajm
aDw
aEK
aGc
aHx
@@ -106119,7 +106087,7 @@ axb
ayy
azF
aAZ
aCm
ajm
aDw
aEL
aGd
@@ -106377,7 +106345,7 @@ ahx
ahx
ahx
ajm
aDy
aDw
aEM
aGe
aHx
@@ -106633,7 +106601,7 @@ axd
ayw
azG
aAY
aCk
ajm
aDw
aEN
aGf
@@ -106890,8 +106858,8 @@ axe
ayz
dCj
azE
aCl
aDx
ajm
aDw
dCo
aGg
aHx
@@ -107147,7 +107115,7 @@ axb
ayy
azF
aBa
aCm
ajm
aDw
aEO
aGh
@@ -107661,7 +107629,7 @@ axd
ayw
azH
aAY
aCk
ajm
aDw
aEO
aGg
@@ -107918,8 +107886,8 @@ axa
ayA
azE
azE
aCl
aDx
ajm
aDw
aEQ
aGj
aHz
@@ -108175,7 +108143,7 @@ axg
ayy
azF
aBb
aCm
ajm
aDw
aEN
aGk
@@ -109717,7 +109685,7 @@ axm
aiq
azL
aBf
ajm
ahx
aDF
aEW
aGq
+161 -91
View File
@@ -10253,27 +10253,27 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"asf" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"asg" = (
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"ash" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"asi" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"asj" = (
/obj/machinery/vending/cola,
@@ -11338,16 +11338,16 @@
},
/obj/structure/table/wood,
/obj/item/kitchen/fork,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aud" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aue" = (
/obj/structure/chair/stool/bar,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"auf" = (
/obj/structure/table/reinforced,
@@ -11855,7 +11855,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"avg" = (
/obj/structure/table/wood,
@@ -11863,7 +11863,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"avh" = (
/obj/structure/chair/stool,
@@ -11871,20 +11871,20 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"avi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"avj" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"avk" = (
/obj/structure/table/reinforced,
@@ -12413,32 +12413,32 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awl" = (
/obj/structure/table/wood,
/obj/item/storage/bag/tray,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awm" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awo" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awp" = (
/obj/structure/table/reinforced,
@@ -12765,7 +12765,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awU" = (
/obj/structure/chair/stool,
@@ -12776,7 +12776,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awV" = (
/obj/structure/table/wood,
@@ -12784,13 +12784,13 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awW" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"awX" = (
/obj/structure/table/reinforced,
@@ -13230,20 +13230,20 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"axP" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"axQ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"axR" = (
/obj/structure/cable/white{
@@ -13564,6 +13564,14 @@
pixel_x = 32
},
/obj/item/bedsheet/blue,
/obj/machinery/button/door{
id = "Dorm3";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"ayB" = (
@@ -13575,6 +13583,14 @@
pixel_x = 32
},
/obj/item/bedsheet/red,
/obj/machinery/button/door{
id = "Dorm4";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = -25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/carpet,
/area/crew_quarters/dorms)
"ayD" = (
@@ -13637,24 +13653,24 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"ayK" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"ayL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"ayM" = (
/obj/machinery/holopad,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"ayN" = (
/obj/item/storage/fancy/cigarettes/cigars{
@@ -14050,6 +14066,7 @@
"azD" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm3";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
@@ -14119,7 +14136,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"azK" = (
/obj/structure/table/wood,
@@ -14127,7 +14144,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"azL" = (
/obj/structure/closet/crate/bin,
@@ -14137,7 +14154,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"azM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -14615,7 +14632,7 @@
/obj/structure/cable/white{
icon_state = "0-4"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAO" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -14634,7 +14651,7 @@
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAP" = (
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -14650,7 +14667,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAQ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -14659,7 +14676,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -14668,7 +14685,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAS" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -14677,7 +14694,7 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aAT" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -15252,12 +15269,12 @@
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aBZ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/cheesiehonkers,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aCa" = (
/obj/machinery/light{
@@ -15266,7 +15283,7 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aCb" = (
/obj/machinery/status_display,
@@ -15758,7 +15775,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aCV" = (
/obj/structure/table/reinforced,
@@ -16083,6 +16100,14 @@
pixel_x = 32
},
/obj/item/bedsheet/brown,
/obj/machinery/button/door{
id = "Dorm1";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/wood,
/area/crew_quarters/dorms)
"aDI" = (
@@ -16091,6 +16116,14 @@
pixel_x = 32
},
/obj/item/bedsheet/black,
/obj/machinery/button/door{
id = "Dorm2";
name = "Cabin Bolt Control";
normaldoorcontrol = 1;
pixel_y = 25;
req_access_txt = "0";
specialfunctions = 4
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/dorms)
"aDJ" = (
@@ -16172,21 +16205,21 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aDP" = (
/obj/effect/landmark/xmastree,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aDQ" = (
/obj/structure/chair/stool/bar,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aDR" = (
/obj/structure/table/reinforced,
@@ -16651,28 +16684,26 @@
/turf/open/floor/plasteel/neutral/corner,
/area/hallway/primary/central)
"aEK" = (
/obj/machinery/vending/clothing,
/obj/machinery/firealarm{
dir = 8;
pixel_x = -24
},
/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/crew_quarters/dorms)
"aEL" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/obj/machinery/status_display{
pixel_y = -32
},
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/crew_quarters/dorms)
"aEM" = (
/obj/structure/closet/crate/bin,
/obj/machinery/vending/clothing,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -16795,12 +16826,12 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aEX" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/chips,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aEY" = (
/obj/structure/table/reinforced,
@@ -17268,7 +17299,7 @@
dir = 4;
network = list("MINE")
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aFO" = (
/obj/structure/table/wood,
@@ -17276,14 +17307,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aFP" = (
/obj/structure/chair/stool,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aFQ" = (
/obj/structure/table/reinforced,
@@ -17760,7 +17791,7 @@
/obj/structure/cable/white{
icon_state = "2-8"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aGO" = (
/obj/item/reagent_containers/food/condiment/saltshaker{
@@ -17775,7 +17806,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aGP" = (
/obj/structure/chair/stool,
@@ -17783,7 +17814,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aGQ" = (
/obj/machinery/holopad,
@@ -17791,7 +17822,7 @@
name = "Station Intercom";
pixel_x = 28
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aGR" = (
/obj/machinery/vending/dinnerware,
@@ -18408,7 +18439,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aHS" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -18417,12 +18448,12 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aHT" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/coffee,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aHU" = (
/obj/item/twohanded/required/kirbyplants{
@@ -18431,7 +18462,7 @@
/obj/structure/sign/poster/random{
pixel_x = 32
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aHV" = (
/obj/machinery/status_display,
@@ -18938,7 +18969,7 @@
pixel_x = 32
},
/obj/structure/closet/crate/bin,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aIR" = (
/obj/structure/closet/secure_closet/freezer/meat,
@@ -19526,7 +19557,7 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aJX" = (
/obj/machinery/vending/cola,
@@ -20157,7 +20188,7 @@
pixel_x = -32;
pixel_y = -32
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aLg" = (
/obj/machinery/vending/snack,
@@ -20704,7 +20735,7 @@
/obj/machinery/light{
dir = 8
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aMu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -20714,7 +20745,7 @@
/obj/structure/cable/white{
icon_state = "2-4"
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"aMv" = (
/obj/effect/decal/cleanable/dirt,
@@ -21719,37 +21750,27 @@
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/turf/open/floor/plasteel/redyellow/side{
dir = 9
},
/turf/open/floor/plasteel/yellowsiding,
/area/hallway/primary/central)
"aOn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/turf/open/floor/plasteel/stairs/left,
/area/hallway/primary/central)
"aOo" = (
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/turf/open/floor/plasteel/stairs/medium,
/area/hallway/primary/central)
"aOp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/redyellow/side{
dir = 1
},
/turf/open/floor/plasteel/stairs/right,
/area/hallway/primary/central)
"aOq" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/redyellow/side{
dir = 5
},
/turf/open/floor/plasteel/yellowsiding,
/area/hallway/primary/central)
"aOr" = (
/obj/structure/sign/directions/engineering{
@@ -33196,7 +33217,7 @@
c_tag = "Central Diner 4";
dir = 1
},
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"blk" = (
/obj/machinery/camera{
@@ -34413,7 +34434,7 @@
dir = 4
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"bxH" = (
/obj/effect/decal/cleanable/dirt,
@@ -34442,7 +34463,7 @@
/area/crew_quarters/dorms)
"bxL" = (
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/redyellow,
/turf/open/floor/plasteel/bar,
/area/crew_quarters/bar/atrium)
"bxM" = (
/obj/effect/landmark/event_spawn,
@@ -34670,6 +34691,55 @@
/obj/machinery/rnd/protolathe/department/medical,
/turf/closed/wall,
/area/medical/medbay/zone3)
"swv" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm4";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"sww" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm1";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"swx" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock{
id_tag = "Dorm2";
name = "Cabin"
},
/obj/effect/turf_decal/stripes/line{
dir = 2
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
"swy" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/vault{
dir = 8
},
/area/maintenance/port)
(1,1,1) = {"
aaa
@@ -67190,7 +67260,7 @@ aZp
bak
bbc
bbQ
bcF
swy
bdD
beu
baj
@@ -67447,7 +67517,7 @@ aZq
bal
bbd
bbR
bcG
bbR
bdE
bev
baj
@@ -72302,7 +72372,7 @@ ayz
azD
aAH
aBQ
azD
sww
aDG
aEO
awQ
@@ -73070,10 +73140,10 @@ apI
awQ
axJ
ayB
azD
swv
aAH
aBS
azD
swx
ayz
aEQ
awQ
+19 -6
View File
@@ -2864,6 +2864,7 @@
"aiY" = (
/obj/structure/table,
/obj/item/device/flashlight/lamp,
/obj/item/storage/box/mousetraps,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"aiZ" = (
@@ -3148,7 +3149,7 @@
/turf/open/space,
/area/space/nearstation)
"ajB" = (
/obj/item/storage/box/mousetraps,
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/security/brig)
"ajC" = (
@@ -47228,7 +47229,7 @@
/turf/open/floor/plasteel/dark,
/area/library)
"clm" = (
/obj/structure/closet/crate/bin,
/obj/machinery/vending/kink,
/turf/open/floor/plasteel/dark,
/area/library)
"cln" = (
@@ -51356,6 +51357,18 @@
/obj/machinery/vending/games,
/turf/open/floor/plasteel/dark,
/area/library)
"cCX" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/crew_quarters/dorms)
"cCY" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/engine)
"cCZ" = (
/obj/machinery/vending/kink,
/turf/open/floor/plating,
/area/maintenance/department/engine)
(1,1,1) = {"
aaa
@@ -73860,7 +73873,7 @@ bvb
bDj
bEo
bva
bva
cCY
bHQ
bJg
bKl
@@ -74116,7 +74129,7 @@ bnv
bnv
bDi
bmf
bsn
bva
bva
bHS
bJh
@@ -79015,7 +79028,7 @@ cCF
cCH
bTn
bPB
bDi
cCZ
bVC
bQj
bPA
@@ -88688,7 +88701,7 @@ aaa
aaa
aaa
aiU
ajv
cCX
aju
ajt
alQ
+1 -1
View File
@@ -30,7 +30,7 @@
#define CHAT_GHOSTRADIO 512
#define CHAT_LOOC 1024
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO)
#define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_LOOC)
#define PARALLAX_INSANE -1 //for show offs
#define PARALLAX_HIGH 0 //default.
+1 -1
View File
@@ -34,7 +34,7 @@
#define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity
#define AIRLOCK_INTEGRITY_MULTIPLIER 1.5 // How much reinforced doors health increases
#define AIRLOCK_DAMAGE_DEFLECTION_N 21 // Normal airlock damage deflection
#define AIRLOCK_DAMAGE_DEFLECTION_N 20 // Normal airlock damage deflection
#define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection
#define NOT_ELECTRIFIED 0
+1
View File
@@ -54,6 +54,7 @@
<A href='?src=[REF(src)];[HrefToken()];secrets=quickpower'>Power all SMES</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=tripleAI'>Triple AI mode (needs to be used in the lobby)</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=traitor_all'>Everyone is the traitor</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=ak47s'>AK47s for everyone!</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=guns'>Summon Guns</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=magic'>Summon Magic</A><BR>
<A href='?src=[REF(src)];[HrefToken()];secrets=events'>Summon Events (Toggle)</A><BR>
@@ -141,7 +141,7 @@
/mob/living/carbon/human/grabbedby(mob/living/carbon/user, supress_message = 0)
if(user == src && pulling && !pulling.anchored && grab_state >= GRAB_AGGRESSIVE && (disabilities & FAT) && ismonkey(pulling))
devour_mob(pulling)
vore_attack(user, pulling)
else
..()
+5 -1
View File
@@ -49,6 +49,10 @@
return
if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
return
if(istype(loc, /obj/item/device/dogborg/sleeper))
return
if(ismob(loc))
return
var/datum/gas_mixture/environment
if(loc)
@@ -456,4 +460,4 @@
death()
var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
if(B)
B.damaged_brain = TRUE
B.damaged_brain = TRUE
+1 -1
View File
@@ -102,7 +102,7 @@
"nerf blob!1",
"iM NOT A FUWRRYY!!!",
"DON'T EVER TUCH ME",
"FOURTEEN INCHES SOFT!!!"
"FOURTEEN INCHES SOFT!!!",
"@pick(semicolon)N-NYAAAAAA~",
"@pick(bug)",
"@pick(semicolon)wtf??????????? @pick(bug)",