diff --git a/baystation12.dme b/baystation12.dme index ed059c8cbc..d56b35583f 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -516,7 +516,6 @@ #include "code\game\machinery\scanner.dm" #include "code\game\machinery\seed_extractor.dm" #include "code\game\machinery\shieldgen.dm" -#include "code\game\machinery\sink.dm" #include "code\game\machinery\Sleeper.dm" #include "code\game\machinery\spaceheater.dm" #include "code\game\machinery\status_display.dm" diff --git a/code/WorkInProgress/Ported/Abi79/uplinks.dm b/code/WorkInProgress/Ported/Abi79/uplinks.dm index ae261a85ac..9795644c3d 100644 --- a/code/WorkInProgress/Ported/Abi79/uplinks.dm +++ b/code/WorkInProgress/Ported/Abi79/uplinks.dm @@ -312,7 +312,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/temp = null //Temporary storage area for a message offering the option to destroy the radio var/selfdestruct = 0 //Set to 1 while the radio is self destructing itself. var/obj/item/device/radio/origradio = null - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT w_class = 2.0 item_state = "radio" throwforce = 5 diff --git a/code/WorkInProgress/Wrongnumber/weldbackpack.dm b/code/WorkInProgress/Wrongnumber/weldbackpack.dm index 637ba56d8d..453e18eb41 100644 --- a/code/WorkInProgress/Wrongnumber/weldbackpack.dm +++ b/code/WorkInProgress/Wrongnumber/weldbackpack.dm @@ -1,7 +1,7 @@ /obj/item/weapon/weldpack name = "Welding kit" desc = "A heavy-duty, portable welding fluid carrier." - flags = ONBACK + slot_flags = SLOT_BACK icon = 'storage.dmi' icon_state = "welderpack" w_class = 4.0 diff --git a/code/WorkInProgress/virus2/antibodies.dm b/code/WorkInProgress/virus2/antibodies.dm index 31de7c02ba..0b9a8b8e8b 100644 --- a/code/WorkInProgress/virus2/antibodies.dm +++ b/code/WorkInProgress/virus2/antibodies.dm @@ -43,8 +43,8 @@ var/global/list/ANTIGENS = list("[ANTIGEN_A]" = "A", "[ANTIGEN_B]" = "B", "[ANTI icon_state = "health" w_class = 2.0 item_state = "electronic" - flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY - + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BELT /obj/item/device/antibody_scanner/attack(mob/living/carbon/human/M as mob, mob/user as mob) if(! istype(M, /mob/living/carbon) || !M:antibodies) diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 83700c3686..49a7910def 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -424,6 +424,7 @@ var/w_class = 3.0 var/protective_temperature = 0 // Placing this here to avoid runtime errors, due to tiny items being allowed on ears and being queried for this variable flags = FPRINT | TABLEPASS + var/slot_flags = 0 //This is used to determine on which slots an item can fit. pass_flags = PASSTABLE pressure_resistance = 50 // causeerrorheresoifixthis diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 56fd9242b9..334c90e2c4 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -28,6 +28,7 @@ /obj/item/clothing/belt name = "belt" - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT */ diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 3b44089a33..82d54ac17e 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -1845,7 +1845,8 @@ name = "bottle of Plant-B-Gone" icon_state = "plantbgone" item_state = "plantbgone" - flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY + slot_flags = SLOT_BELT throwforce = 3 w_class = 2.0 throw_speed = 2 @@ -1859,7 +1860,8 @@ name = "weed-spray" icon_state = "weedspray" item_state = "spray" - flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY + slot_flags = SLOT_BELT throwforce = 4 w_class = 2.0 throw_speed = 2 @@ -1873,7 +1875,8 @@ name = "pest-spray" icon_state = "pestspray" item_state = "spray" - flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = TABLEPASS | OPENCONTAINER | FPRINT | USEDELAY + slot_flags = SLOT_BELT throwforce = 4 w_class = 2.0 throw_speed = 2 diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index e7aadffa70..c774527b02 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -3,7 +3,8 @@ desc = "You wear this on your back and put items into it." icon_state = "backpack" w_class = 4.0 - flags = 259.0 + flags = FPRINT|TABLEPASS + slot_flags = SLOT_BACK //ERROOOOO max_w_class = 3 max_combined_w_class = 21 diff --git a/code/defines/obj/toy.dm b/code/defines/obj/toy.dm index 985a683c84..5d8b126963 100644 --- a/code/defines/obj/toy.dm +++ b/code/defines/obj/toy.dm @@ -129,7 +129,8 @@ icon = 'gun.dmi' icon_state = "revolver" item_state = "gun" - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BELT w_class = 3.0 g_amt = 10 m_amt = 10 diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index c143fc109a..5ca3759a80 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -10,7 +10,8 @@ desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." icon = 'weapons.dmi' icon_state = "riot" - flags = FPRINT | TABLEPASS| CONDUCT| ONBACK + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BACK force = 5.0 throwforce = 5.0 throw_speed = 1 @@ -29,7 +30,8 @@ desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers." icon_state = "nullrod" item_state = "nullrod" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 10 throw_speed = 1 throw_range = 4 @@ -81,7 +83,8 @@ desc = "This thing is so unspeakably shitty you are having a hard time even holding it." icon_state = "sord" item_state = "sord" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 2 throwforce = 1 w_class = 3*/ @@ -91,7 +94,8 @@ desc = "BLOOD FOR THE BLOOD GOD." //SKULLS FOR THE SKULL THRONE. --SkyMarshal icon_state = "claymore" item_state = "claymore" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 40 throwforce = 10 w_class = 3 @@ -319,16 +323,16 @@ icon_state = "spectrometer" item_state = "analyzer" w_class = 2.0 - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT | OPENCONTAINER + flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER + slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 m_amt = 30 g_amt = 20 origin_tech = "magnets=2;biotech=2" - var - details = 0 - recent_fail = 0 + var/details = 0 + var/recent_fail = 0 /obj/item/device/mass_spectrometer/adv name = "advanced mass-spectrometer" @@ -341,7 +345,8 @@ desc = "The police baton of the future." icon_state = "stunbaton" item_state = "baton" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 15 throwforce = 7 w_class = 3 @@ -355,7 +360,8 @@ desc = "The Captain is first and all other heads are last." icon_state = "chainofcommand" item_state = "chainofcommand" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 10 throwforce = 7 w_class = 3 @@ -674,6 +680,7 @@ item_state = "card-id" var/access = list() var/registered_name = null // The name registered_name on the card + slot_flags = SLOT_ID var/pin = 0 var/money = 0 var/assignment = null @@ -742,7 +749,8 @@ w_class = 2.0 throw_speed = 3 throw_range = 10 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT /obj/item/weapon/clipboard/notebook name = "notebook" @@ -763,7 +771,8 @@ throw_range = 5 m_amt = 50 g_amt = 20 - flags = TABLEPASS|USEDELAY|FPRINT|CONDUCT | ONBELT + flags = TABLEPASS | USEDELAY | FPRINT | CONDUCT + slot_flags = SLOT_BELT item_state = "coil_red" /obj/item/weapon/cable_coil/cut @@ -796,7 +805,8 @@ desc = "Used to remove floor tiles." icon = 'items.dmi' icon_state = "crowbar" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 5.0 throwforce = 7.0 item_state = "wrench" @@ -952,7 +962,8 @@ gender = PLURAL icon = 'items.dmi' icon_state = "handcuff" - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT throwforce = 5 w_class = 2.0 throw_speed = 2 @@ -1102,7 +1113,8 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove name = "pen" icon = 'paper.dmi' icon_state = "pen" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT throwforce = 0 w_class = 1.0 throw_speed = 7 @@ -1135,7 +1147,8 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove name = "banhammer" icon = 'items.dmi' icon_state = "toyhammer" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT throwforce = 0 w_class = 1.0 throw_speed = 7 @@ -1143,12 +1156,14 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove /obj/item/weapon/pen/sleepypen desc = "It's a normal black ink pen with a sharp point." - flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER + flags = FPRINT | TABLEPASS | OPENCONTAINER + slot_flags = SLOT_BELT origin_tech = "materials=2;biotech=1;syndicate=7" /obj/item/weapon/pen/paralysis desc = "It's a normal black ink pen with a sharp point." - flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER + flags = FPRINT | TABLEPASS | OPENCONTAINER + slot_flags = SLOT_BELT origin_tech = "materials=2;biotech=1;syndicate=5" /obj/item/weapon/rack_parts @@ -1172,7 +1187,8 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove desc = "Used for screwing." icon = 'items.dmi' icon_state = "screwdriver" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 5.0 w_class = 1.0 throwforce = 5.0 @@ -1202,7 +1218,8 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove var/selfdestruct = 0.0 var/traitor_frequency = 0.0 var/obj/item/device/radio/origradio = null - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT item_state = "radio" throwforce = 5 w_class = 2.0 @@ -1741,7 +1758,8 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove w_class = 1 throwforce = 2 var/cigarcount = 6 - flags = ONBELT | TABLEPASS */ + flags = TABLEPASS + slot_flags = SLOT_BELT*/ /obj/item/weapon/mousetrap diff --git a/code/game/asteroid/device.dm b/code/game/asteroid/device.dm index 7407f45f67..3472aecdd0 100644 --- a/code/game/asteroid/device.dm +++ b/code/game/asteroid/device.dm @@ -2,7 +2,8 @@ name = "GPS" icon = 'device.dmi' icon_state = "pinoff" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT w_class = 2.0 item_state = "electronic" throw_speed = 4 diff --git a/code/game/chemistry.dm b/code/game/chemistry.dm index 2b3f5beeca..6f155a79fa 100644 --- a/code/game/chemistry.dm +++ b/code/game/chemistry.dm @@ -11,7 +11,8 @@ item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | ONBELT | USEDELAY + flags = FPRINT | TABLEPASS | USEDELAY + slot_flags = SLOT_BELT var/datum/effect/effect/system/bad_smoke_spread/smoke /obj/item/weapon/mustardbomb @@ -25,7 +26,8 @@ item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT var/datum/effect/effect/system/mustard_gas_spread/mustard_gas /obj/item/weapon/smokebomb/New() diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 1647eb7047..a39f70939f 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -3,11 +3,13 @@ desc = "An arcane weapon wielded by the followers of Nar-Sie" icon_state = "cultblade" item_state = "cultblade" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 40 throwforce = 10 + /obj/item/clothing/head/culthood name = "cult hood" icon_state = "culthood" diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index fa38c98f62..4c528f5f5a 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -2,7 +2,8 @@ name = "pinpointer" icon = 'device.dmi' icon_state = "pinoff" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT w_class = 2.0 item_state = "electronic" throw_speed = 4 diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 8ace91fde7..802cfd68c1 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -5,7 +5,8 @@ item_state = "electronic" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." w_class = 1.0 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT origin_tech = "bluespace=4;materials=4" var/imprinted = "empty" diff --git a/code/game/machinery/sink.dm b/code/game/machinery/sink.dm deleted file mode 100644 index e89b11828d..0000000000 --- a/code/game/machinery/sink.dm +++ /dev/null @@ -1,151 +0,0 @@ -/obj/machinery/sink - name = "sink" - icon = 'device.dmi' - icon_state = "sink" - desc = "A sink used for washing one's hands and face." - anchored = 1 - var/busy = 0 //Something's being washed at the moment - var/mode = 0 //0 == fill, 1 == pour - - - New() - ..() - verbs += /obj/machinery/sink/proc/mode_pour - - attack_hand(mob/M as mob) - if(isrobot(M) || isAI(M)) - return - - if(busy) - M << "\red Someone's already washing something here." - return - M << "\blue You start washing up." - - busy = 1 - if(do_after(M,40)) - M.clean_blood() - if(istype(M, /mob/living/carbon)) - var/mob/living/carbon/C = M - C.clean_blood() - /* - if(C.r_hand) - C.r_hand.clean_blood() // The hand you attack with is empty anyway, the other one should not be washed while doing this. - if(C.l_hand) - C.l_hand.clean_blood() - - if(C.wear_mask) - C.wear_mask.clean_blood() //- NOPE, Washing machine -Errorage - */ - if(istype(M, /mob/living/carbon/human)) - /*if(C:w_uniform) - C:w_uniform.clean_blood() //- NOPE, Washing machine -Errorage - if(C:wear_suit) - C:wear_suit.clean_blood() //- NOPE, Washing machine -Errorage - if(C:shoes) - C:shoes.clean_blood()*/ //- NOPE, Washing machine -Errorage - if(C:gloves) - C:gloves.clean_blood() - /*if(C:head) - C:head.clean_blood()*/ //- NOPE, Washing machine -Errorage - for(var/mob/V in viewers(src, null)) - V.show_message(text("\blue [M] washes up using \the [src].")) - busy = 0 - - proc/mode_pour() - set name = "Mode -> Pour" - set category = "Object" - set src in oview(1) - - mode = 1 - verbs -= /obj/machinery/sink/proc/mode_pour - verbs += /obj/machinery/sink/proc/mode_fill - usr << "You will now pour reagents down \the [src]." - - proc/mode_fill() - set name = "Mode -> Fill" - set category = "Object" - set src in oview(1) - - mode = 0 - verbs -= /obj/machinery/sink/proc/mode_fill - verbs += /obj/machinery/sink/proc/mode_pour - usr << "You will now fill your container from the faucet." - - attackby(var/obj/item/O as obj, var/mob/user as mob) - if(busy) - user << "\red Someone's already washing something here." - return - - if (istype(O, /obj/item/weapon/reagent_containers/glass/bucket)) - O:reagents.add_reagent("water", 70) - user.visible_message( \ - "\blue [user] fills the [O] using the [src].", \ - "\blue You fill the [O] using the [src].") - return - - if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks)) - if(!mode) - // fill - if(O.reagents.total_volume < O.reagents.maximum_volume) - O:reagents.add_reagent("water", 10) - user.visible_message( \ - "\blue [user] fills the [O] using the [src].", \ - "\blue You fill the [O] using the [src].") - else - user.visible_message( \ - "\blue [user] spills water out of the overflowing [O] into the [src].", \ - "\blue You spill water out of the overflowing [O] into the [src].") - else - // pour - if(O.reagents.total_volume > 0) - O.reagents.clear_reagents() - user.visible_message( \ - "\blue [user] pours the contents of \the [O] into \the [src].", \ - "\blue You pour the contents of \the [O] into \the [src].") - else - user << "\The [O] is empty." - return - else if (istype(O, /obj/item/weapon/melee/baton)) - var/obj/item/weapon/melee/baton/B = O - if (B.charges > 0 && B.status == 1) - flick("baton_active", src) - user.Stun(10) - user.stuttering = 10 - user.Weaken(10) - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - R.cell.charge -= 20 - else - B.charges-- - user.visible_message( \ - "[user] was stunned by his wet [O].", \ - "\red You have wet \the [O], it shocks you!") - return - - var/obj/item/I = O - if(!I || !istype(I,/obj/item)) return - - usr << "\blue You start washing up." - - busy = 1 - if(do_after(user,40)) - if(!I) return //Item's been destroyed while washing - - O.clean_blood() - user.visible_message( \ - "\blue [user] washes \a [I] using \the [src].", \ - "\blue You wash \a [I] using \the [src].") - busy = 0 - - shower - name = "Shower" - desc = "This is a shower. Useful for cleaning." - icon_state = "shower" - - kitchen - name = "Kitchen Sink" - icon_state = "sink_alt" - - kitchen2 - name = "Kitchen Sink" - icon_state = "sink_alt2" diff --git a/code/game/objects/closets/extinguisher.dm b/code/game/objects/closets/extinguisher.dm index 1d503333d7..82dc7d88aa 100644 --- a/code/game/objects/closets/extinguisher.dm +++ b/code/game/objects/closets/extinguisher.dm @@ -1,4 +1,4 @@ -/obj/structure/closet/extinguisher +/obj/structure/extinguisher_cabinet name = "extinguisher cabinet" desc = "A small wall mounted cabinet designed to hold a fire extinguisher." icon = 'closet.dmi' @@ -6,10 +6,11 @@ anchored = 1 density = 0 var/obj/item/weapon/extinguisher/has_extinguisher = new/obj/item/weapon/extinguisher + var/opened = 0 -/obj/structure/closet/extinguisher/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/structure/extinguisher_cabinet/attackby(var/obj/item/O as obj, var/mob/user as mob) if (isrobot(usr)) return if (istype(O, /obj/item/weapon/extinguisher)) @@ -26,7 +27,7 @@ -/obj/structure/closet/extinguisher/attack_hand(mob/user as mob) +/obj/structure/extinguisher_cabinet/attack_hand(mob/user as mob) if(has_extinguisher) user.put_in_hand(has_extinguisher) has_extinguisher = null @@ -38,13 +39,13 @@ -/obj/structure/closet/extinguisher/attack_paw(mob/user as mob) +/obj/structure/extinguisher_cabinet/attack_paw(mob/user as mob) attack_hand(user) return -/obj/structure/closet/extinguisher/update_icon() +/obj/structure/extinguisher_cabinet/update_icon() if(!opened) icon_state = "extinguisher_closed" return diff --git a/code/game/objects/devices/PDA/PDA.dm b/code/game/objects/devices/PDA/PDA.dm index 82b5235c2c..24b5eba841 100755 --- a/code/game/objects/devices/PDA/PDA.dm +++ b/code/game/objects/devices/PDA/PDA.dm @@ -8,7 +8,8 @@ icon_state = "pda" item_state = "electronic" w_class = 1.0 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_ID | SLOT_BELT //Main variables var/owner = null diff --git a/code/game/objects/devices/aicard.dm b/code/game/objects/devices/aicard.dm index ea733eab5b..f81d3e2089 100644 --- a/code/game/objects/devices/aicard.dm +++ b/code/game/objects/devices/aicard.dm @@ -4,7 +4,8 @@ icon_state = "aicard" // aicard-full item_state = "electronic" w_class = 2.0 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT var/flush = null origin_tech = "programming=4;materials=4" diff --git a/code/game/objects/devices/chameleonproj.dm b/code/game/objects/devices/chameleonproj.dm index 0526ec5ff2..c8e7ff754c 100644 --- a/code/game/objects/devices/chameleonproj.dm +++ b/code/game/objects/devices/chameleonproj.dm @@ -42,7 +42,8 @@ /obj/item/device/chameleon name = "chameleon-projector" icon_state = "shield0" - flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY + slot_flags = SLOT_BELT item_state = "electronic" throwforce = 5.0 throw_speed = 1 diff --git a/code/game/objects/devices/flashlight.dm b/code/game/objects/devices/flashlight.dm index 66b6f327f2..9d272e2781 100644 --- a/code/game/objects/devices/flashlight.dm +++ b/code/game/objects/devices/flashlight.dm @@ -4,14 +4,14 @@ icon_state = "flight0" w_class = 2 item_state = "flight" - flags = FPRINT | ONBELT | TABLEPASS | CONDUCT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT m_amt = 50 g_amt = 20 - var - on = 0 - brightness_on = 4 //luminosity when on - icon_on = "flight1" - icon_off = "flight0" + var/on = 0 + var/brightness_on = 4 //luminosity when on + var/icon_on = "flight1" + var/icon_off = "flight0" /obj/item/device/flashlight/initialize() ..() diff --git a/code/game/objects/devices/paicard.dm b/code/game/objects/devices/paicard.dm index ff7e2ef5db..e13b7c605f 100644 --- a/code/game/objects/devices/paicard.dm +++ b/code/game/objects/devices/paicard.dm @@ -4,7 +4,8 @@ icon_state = "pai" item_state = "electronic" w_class = 2.0 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT origin_tech = "programming=2" var/obj/item/device/radio/radio var/looking_for_personality = 0 diff --git a/code/game/objects/devices/scanners.dm b/code/game/objects/devices/scanners.dm index 8d0211e7f2..1eae1c00ab 100644 --- a/code/game/objects/devices/scanners.dm +++ b/code/game/objects/devices/scanners.dm @@ -14,7 +14,8 @@ MASS SPECTROMETER desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes." icon_state = "t-ray0" var/on = 0 - flags = FPRINT|ONBELT|TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT w_class = 2 item_state = "electronic" m_amt = 150 @@ -68,8 +69,8 @@ MASS SPECTROMETER var/list/stored = list() w_class = 3.0 item_state = "electronic" - flags = FPRINT | TABLEPASS | ONBELT | CONDUCT | USEDELAY - + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BELT attackby(obj/item/weapon/f_card/W as obj, mob/user as mob) ..() @@ -240,7 +241,8 @@ MASS SPECTROMETER icon_state = "health" item_state = "analyzer" desc = "A hand-held body scanner able to distinguish vital signs of the subject." - flags = FPRINT | ONBELT | TABLEPASS | CONDUCT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT throwforce = 3 w_class = 1.0 throw_speed = 5 @@ -249,64 +251,64 @@ MASS SPECTROMETER origin_tech = "magnets=1;biotech=1" var/mode = 1; - proc - analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob) - var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss()))) - if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath)) - user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1) - user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) +/obj/item/device/healthanalyzer/proc/analyze_health_less_info(mob/living/carbon/M as mob, mob/user as mob) + var/fake_oxy = max(rand(1,40), M.getOxyLoss(), (300 - (M.getToxLoss() + M.getFireLoss() + M.getBruteLoss()))) + if((M.reagents && M.reagents.has_reagent("zombiepowder")) || (M.changeling && M.changeling.changeling_fakedeath)) + user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, "dead"), 1) + user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", fake_oxy < 50 ? "\red [fake_oxy]" : fake_oxy , M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) + else + user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health - M.halloss))), 1) + user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) + user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) + if(mode == 1 && istype(M, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = M + var/list/damaged = H.get_damaged_organs(1,1) + user.show_message("\blue Localized Damage, Brute/Burn:",1) + if(length(damaged)>0) + for(var/datum/organ/external/org in damaged) + user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1) + else + user.show_message("\blue \t Limbs are OK.",1) + + if((M.changeling && M.changeling.changeling_fakedeath) || (M.reagents && M.reagents.has_reagent("zombiepowder"))) + user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) + else + user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) + if (M.getCloneLoss()) + user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1) + for(var/datum/disease/D in M.viruses) + if(!D.hidden[SCANNER]) + user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) + if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) + user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1) + if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0) + user.show_message(text("\red Subject is brain dead."), 1) + else if (M.getBrainLoss() >= 60) + user.show_message(text("\red Severe brain damage detected. Subject likely to have mental retardation."), 1) + else if (M.getBrainLoss() >= 10) + user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1) + if (M.virus2 || M.reagents.reagent_list.len > 0) + user.show_message(text("\red Unknown substance detected in blood."), 1) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + for(var/name in H.organs) + var/datum/organ/external/e = H.organs[name] + if(e.broken) + user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1) + break + if(ishuman(M)) + if(M:vessel) + var/blood_volume = round(M:vessel.get_reagent_amount("blood")) + var/blood_percent = blood_volume / 560 + blood_percent *= 100 + if(blood_volume <= 448) + user.show_message("\red Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl") + else if(blood_volume <= 336) + user.show_message("\red Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl") else - user.show_message(text("\blue Analyzing Results for []:\n\t Overall Status: []", M, (M.stat > 1 ? "dead" : text("[]% healthy", M.health - M.halloss))), 1) - user.show_message(text("\blue \t Damage Specifics: []-[]-[]-[]", M.getOxyLoss() > 50 ? "\red [M.getOxyLoss()]" : M.getOxyLoss(), M.getToxLoss() > 50 ? "\red [M.getToxLoss()]" : M.getToxLoss(), M.getFireLoss() > 50 ? "\red[M.getFireLoss()]" : M.getFireLoss(), M.getBruteLoss() > 50 ? "\red[M.getBruteLoss()]" : M.getBruteLoss()), 1) - user.show_message("\blue Key: Suffocation/Toxin/Burns/Brute", 1) - user.show_message("\blue Body Temperature: [M.bodytemperature-T0C]°C ([M.bodytemperature*1.8-459.67]°F)", 1) - if(mode == 1 && istype(M, /mob/living/carbon/human)) - var/mob/living/carbon/human/H = M - var/list/damaged = H.get_damaged_organs(1,1) - user.show_message("\blue Localized Damage, Brute/Burn:",1) - if(length(damaged)>0) - for(var/datum/organ/external/org in damaged) - user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1) - else - user.show_message("\blue \t Limbs are OK.",1) - if((M.changeling && M.changeling.changeling_fakedeath) || (M.reagents && M.reagents.has_reagent("zombiepowder"))) - user.show_message(text("\blue [] | [] | [] | []", fake_oxy > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) - else - user.show_message(text("\blue [] | [] | [] | []", M.getOxyLoss() > 50 ? "\red Severe oxygen deprivation detected\blue" : "Subject bloodstream oxygen level normal", M.getToxLoss() > 50 ? "\red Dangerous amount of toxins detected\blue" : "Subject bloodstream toxin level minimal", M.getFireLoss() > 50 ? "\red Severe burn damage detected\blue" : "Subject burn injury status O.K", M.getBruteLoss() > 50 ? "\red Severe anatomical damage detected\blue" : "Subject brute-force injury status O.K"), 1) - if (M.getCloneLoss()) - user.show_message(text("\red Subject appears to have been imperfectly cloned."), 1) - for(var/datum/disease/D in M.viruses) - if(!D.hidden[SCANNER]) - user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) - if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) - user.show_message(text("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals."), 1) - if (M.getBrainLoss() >= 100 || istype(M, /mob/living/carbon/human) && M:brain_op_stage == 4.0) - user.show_message(text("\red Subject is brain dead."), 1) - else if (M.getBrainLoss() >= 60) - user.show_message(text("\red Severe brain damage detected. Subject likely to have mental retardation."), 1) - else if (M.getBrainLoss() >= 10) - user.show_message(text("\red Significant brain damage detected. Subject may have had a concussion."), 1) - if (M.virus2 || M.reagents.reagent_list.len > 0) - user.show_message(text("\red Unknown substance detected in blood."), 1) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - for(var/name in H.organs) - var/datum/organ/external/e = H.organs[name] - if(e.broken) - user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1) - break - if(ishuman(M)) - if(M:vessel) - var/blood_volume = round(M:vessel.get_reagent_amount("blood")) - var/blood_percent = blood_volume / 560 - blood_percent *= 100 - if(blood_volume <= 448) - user.show_message("\red Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl") - else if(blood_volume <= 336) - user.show_message("\red Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl") - else - user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl") - return + user.show_message("\blue Blood Level Normal: [blood_percent]% [blood_volume]cl") + return /obj/item/device/healthanalyzer/attack(mob/M as mob, mob/user as mob) if ((user.mutations & CLUMSY || user.getBrainLoss() >= 60) && prob(50)) @@ -346,7 +348,8 @@ MASS SPECTROMETER icon_state = "atmos" item_state = "analyzer" w_class = 2.0 - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT throwforce = 5 throw_speed = 4 throw_range = 20 diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 33a1c461ea..4f03aeec42 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -7,9 +7,8 @@ icon_state = "candle1" item_state = "candle1" - var - wax = 200 - lit = 0 + var/wax = 200 + var/lit = 0 proc light(var/flavor_text = "\red [usr] lights the [name].") @@ -94,7 +93,8 @@ w_class = 1 throwforce = 2 var/candlecount = 5 - flags = ONBELT | TABLEPASS + flags = TABLEPASS + slot_flags = SLOT_BELT /obj/item/weapon/candlepack/update_icon() diff --git a/code/game/objects/items/robot_parts.dm b/code/game/objects/items/robot_parts.dm index fcc1df6dd6..169adde5b8 100644 --- a/code/game/objects/items/robot_parts.dm +++ b/code/game/objects/items/robot_parts.dm @@ -3,7 +3,8 @@ icon = 'robot_parts.dmi' item_state = "buildpipe" icon_state = "blank" - flags = FPRINT | ONBELT | TABLEPASS | CONDUCT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT var/construction_time = 100 var/list/construction_cost = list("metal"=20000,"glass"=5000) diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index ecb7bc49f0..facac75815 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -58,7 +58,8 @@ desc = "A heavy-duty, no fun allowed trash bag." var/mode = 1; //0 = pick one at a time, 1 = pick all on tile var/capacity = 25; //the number of trash it can carry. - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT w_class = 2.0 /obj/item/weapon/trashbag/update_icon() @@ -88,6 +89,7 @@ if(contents.len < capacity) //slightly redundant, but it makes it prettier in the chatbox. -Pete user << "\blue You pick up all the trash." for(var/obj/item/O in get_turf(W)) + if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak if(contents.len < capacity) if(O.w_class <= 2) contents += O; @@ -97,6 +99,7 @@ else user << "\blue The bag is full!" else + if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak if(contents.len < capacity) contents += W; else diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 7e0c05a176..542b7fb9a3 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -63,7 +63,8 @@ ZIPPO icon_state = "matchbox" item_state = "zippo" w_class = 1 - flags = ONBELT | TABLEPASS + flags = TABLEPASS + slot_flags = SLOT_BELT var/matchcount = 10 w_class = 1.0 @@ -113,14 +114,14 @@ ZIPPO item_state = "cigoff" w_class = 1 body_parts_covered = null - var - lit = 0 - icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi - icon_off = "cigoff" - icon_butt = "cigbutt" - lastHolder = null - smoketime = 300 - butt_count = 5 //count of butt sprite variations + var/lit = 0 + var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi + var/icon_off = "cigoff" + var/icon_butt = "cigbutt" + var/lastHolder = null + var/smoketime = 300 + var/butt_count = 5 //count of butt sprite variations + proc light(var/flavor_text = "[usr] lights the [name].") @@ -161,7 +162,6 @@ ZIPPO processing_objects.Add(src) - process() var/turf/location = get_turf(src) src.smoketime-- @@ -244,13 +244,13 @@ ZIPPO item_state = "cobpipeoff" w_class = 1 body_parts_covered = null - var - lit = 0 - icon_on = "cobpipeon" //Note - these are in masks.dmi - icon_off = "cobpipeoff" - lastHolder = null - smoketime = 100 - maxsmoketime = 100 //make sure this is equal to your smoketime + var/lit = 0 + var/icon_on = "cobpipeon" //Note - these are in masks.dmi + var/icon_off = "cobpipeoff" + var/lastHolder = null + var/smoketime = 100 + var/maxsmoketime = 100 //make sure this is equal to your smoketime + proc light(var/flavor_text = "[usr] lights the [name].") @@ -337,9 +337,9 @@ ZIPPO item_state = "cigpacket" w_class = 1 throwforce = 2 - flags = ONBELT | TABLEPASS - var - cigcount = 6 + flags = TABLEPASS + slot_flags = SLOT_BELT + var/cigcount = 6 update_icon() @@ -382,7 +382,8 @@ ZIPPO var/icon_off = "lighter-g" w_class = 1 throwforce = 4 - flags = ONBELT | TABLEPASS | CONDUCT + flags = TABLEPASS | CONDUCT + slot_flags = SLOT_BELT var/lit = 0 /obj/item/weapon/lighter/zippo @@ -410,16 +411,16 @@ ZIPPO src.item_state = icon_on if( istype(src,/obj/item/weapon/lighter/zippo) ) for(var/mob/O in viewers(user, null)) - O.show_message(text("\red Without even breaking stride, [] flips open and lights [] in one smooth movement.", user, src), 1) + O.show_message(text("\red Without even breaking stride, \the [] flips open and lights \the [] in one smooth movement.", user, src), 1) else if(prob(75)) for(var/mob/O in viewers(user, null)) - O.show_message("\red After a few attempts, [user] manages to light [src].", 1) + O.show_message("\red After a few attempts, \the [user] manages to light \the [src].", 1) else user << "\red You burn yourself while lighting the lighter." user.adjustFireLoss(5) for(var/mob/O in viewers(user, null)) - O.show_message("\red After a few attempts, [user] manages to light [src], they however burn their finger in the process.", 1) + O.show_message("\red After a few attempts, \the [user] manages to light \the [src], they however burn themself in the process.", 1) user.total_luminosity += 2 processing_objects.Add(src) @@ -472,4 +473,4 @@ ZIPPO if(lit) user.total_luminosity -= 2 src.sd_SetLuminosity(2) - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 96e5480a8b..6e42d47d02 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -14,15 +14,17 @@ FLASHBANG item_state = "emp" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT origin_tech = "materials=2;magnets=3" - var - active = 0 - det_time = 50 - proc - prime() - clown_check(var/mob/living/user) + var/active = 0 + var/det_time = 50 + proc/prime() + return + + proc/clown_check(var/mob/living/user) + return afterattack(atom/target as mob|obj|turf|area, mob/user as mob) if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container @@ -88,17 +90,21 @@ FLASHBANG item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT origin_tech = "materials=2;combat=1" - var - active = 0 - det_time = 30 - banglet = 0 - proc - bang(var/turf/T , var/mob/living/carbon/M) - prime() - clown_check(var/mob/living/user) + var/active = 0 + var/det_time = 30 + var/banglet = 0 + proc/bang(var/turf/T , var/mob/living/carbon/M) + return + + proc/prime() + return + + proc/clown_check(var/mob/living/user) + return attackby(obj/item/weapon/W as obj, mob/user as mob) if (isscrewdriver(W)) @@ -227,7 +233,6 @@ FLASHBANG M << "\red Your ears start to ring!" prime() // Prime now just handles the two loops that query for people in lockers and people who can see it. - var/turf/T = get_turf(src) if(T) T.hotspot_expose(700,125) diff --git a/code/game/objects/items/weapons/mops_cleaners.dm b/code/game/objects/items/weapons/mops_cleaners.dm index 2af673ae4f..05c19cfbed 100644 --- a/code/game/objects/items/weapons/mops_cleaners.dm +++ b/code/game/objects/items/weapons/mops_cleaners.dm @@ -4,7 +4,8 @@ name = "space cleaner" icon_state = "cleaner" item_state = "cleaner" - flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + slot_flags = SLOT_BELT throwforce = 3 w_class = 2.0 throw_speed = 2 @@ -115,7 +116,8 @@ name = "chem sprayer" icon_state = "chemsprayer" item_state = "chemsprayer" - flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + flags = TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY + slot_flags = SLOT_BELT throwforce = 3 w_class = 3.0 throw_speed = 2 @@ -210,7 +212,6 @@ return - return //Pepper spray, set up to make the 2 different types /obj/item/weapon/pepperspray //This is riot control @@ -219,7 +220,8 @@ name = "pepperspray" icon_state = "pepperspray" item_state = "pepperspray" - flags = ONBELT|TABLEPASS|FPRINT|USEDELAY + flags = TABLEPASS | FPRINT | USEDELAY + slot_flags = SLOT_BELT throwforce = 3 w_class = 2.0 throw_speed = 2 @@ -234,7 +236,8 @@ name = "mace" icon_state = "pepperspray" item_state = "pepperspray" - flags = ONBELT|TABLEPASS|FPRINT|USEDELAY + flags = TABLEPASS | FPRINT | USEDELAY + slot_flags = SLOT_BELT throwforce = 3 w_class = 1.0 throw_speed = 2 @@ -451,13 +454,12 @@ obj/item/weapon/mop/proc/clean(turf/simulated/A as turf) /proc/GetColors(hex) hex = uppertext(hex) - var - hi1 = text2ascii(hex, 2) - lo1 = text2ascii(hex, 3) - hi2 = text2ascii(hex, 4) - lo2 = text2ascii(hex, 5) - hi3 = text2ascii(hex, 6) - lo3 = text2ascii(hex, 7) + var/hi1 = text2ascii(hex, 2) + var/lo1 = text2ascii(hex, 3) + var/hi2 = text2ascii(hex, 4) + var/lo2 = text2ascii(hex, 5) + var/hi3 = text2ascii(hex, 6) + var/lo3 = text2ascii(hex, 7) return list(((hi1>= 65 ? hi1-55 : hi1-48)<<4) | (lo1 >= 65 ? lo1-55 : lo1-48), ((hi2 >= 65 ? hi2-55 : hi2-48)<<4) | (lo2 >= 65 ? lo2-55 : lo2-48), ((hi3 >= 65 ? hi3-55 : hi3-48)<<4) | (lo3 >= 65 ? lo3-55 : lo3-48)) diff --git a/code/game/objects/items/weapons/plant_bag.dm b/code/game/objects/items/weapons/plant_bag.dm index 1cbb6f7903..4f13ee45e1 100644 --- a/code/game/objects/items/weapons/plant_bag.dm +++ b/code/game/objects/items/weapons/plant_bag.dm @@ -7,7 +7,8 @@ name = "Plant Bag" var/mode = 1; //0 = pick one at a time, 1 = pick all on tile var/capacity = 50; //the number of plant pieces it can carry. - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT w_class = 1 /obj/item/weapon/plantbag/attack_self(mob/user as mob) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 4d301b5fc0..3c53a0a944 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -13,7 +13,8 @@ WELDINGTOOOL desc = "A wrench with common uses. Can be found in your hand." icon = 'items.dmi' icon_state = "wrench" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 5.0 throwforce = 7.0 w_class = 2.0 @@ -44,7 +45,8 @@ WELDINGTOOOL name = "Welding Tool" icon = 'items.dmi' icon_state = "welder" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 3.0 throwforce = 5.0 throw_speed = 1 @@ -53,10 +55,9 @@ WELDINGTOOOL m_amt = 70 g_amt = 30 origin_tech = "engineering=1" - var - welding = 0 - status = 1 - max_fuel = 20 + var/welding = 0 + var/status = 1 + var/max_fuel = 20 proc get_fuel() remove_fuel(var/amount = 1, var/mob/M = null) @@ -224,7 +225,6 @@ WELDINGTOOOL src.damtype = "brute" src.icon_state = "welder" src.welding = 0 - return eyecheck(mob/user as mob) @@ -313,7 +313,8 @@ WELDINGTOOOL desc = "This cuts wires." icon = 'items.dmi' icon_state = "cutters" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 6.0 throw_speed = 2 throw_range = 9 diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index b39e32a55b..14eff5ba0f 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -93,7 +93,7 @@ desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?" force = 5 w_class = 4.0 - flags = ONBACK + slot_flags = SLOT_BACK force_unwielded = 5 force_wielded = 18 diff --git a/code/game/objects/new_year.dm b/code/game/objects/new_year.dm index 90ed7f1066..4bf649b554 100644 --- a/code/game/objects/new_year.dm +++ b/code/game/objects/new_year.dm @@ -55,7 +55,8 @@ item_state = "flashbang" throw_speed = 4 throw_range = 20 - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT /obj/item/weapon/firbang/afterattack(atom/target as mob|obj|turf|area, mob/user as mob) if (user.equipped() == src) diff --git a/code/game/objects/radio/headset.dm b/code/game/objects/radio/headset.dm index 7e58b10f89..b0e18b3769 100644 --- a/code/game/objects/radio/headset.dm +++ b/code/game/objects/radio/headset.dm @@ -8,11 +8,13 @@ subspace_transmission = 1 protective_temperature = 0 canhear_range = 1 // can't hear headsets from very far away - var - translate_binary = 0 - translate_hive = 0 - obj/item/device/encryptionkey/keyslot1 = null - obj/item/device/encryptionkey/keyslot2 = null + + slot_flags = SLOT_EARS + protective_temperature = 0 + var/translate_binary = 0 + var/translate_hive = 0 + var/obj/item/device/encryptionkey/keyslot1 = null + var/obj/item/device/encryptionkey/keyslot2 = null /obj/item/device/radio/headset/New() ..() diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm index 11dcc50c2a..51c168e955 100644 --- a/code/game/objects/storage/belt.dm +++ b/code/game/objects/storage/belt.dm @@ -4,7 +4,8 @@ icon = 'belts.dmi' icon_state = "utilitybelt" item_state = "utility" - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT max_w_class = 3 max_combined_w_class = 21 diff --git a/code/game/objects/tank.dm b/code/game/objects/tank.dm index 73b890be9e..fb71127510 100644 --- a/code/game/objects/tank.dm +++ b/code/game/objects/tank.dm @@ -5,7 +5,8 @@ var/datum/gas_mixture/air_contents = null var/distribute_pressure = ONE_ATMOSPHERE - flags = FPRINT | TABLEPASS | CONDUCT | ONBACK + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BACK pressure_resistance = ONE_ATMOSPHERE*5 @@ -34,7 +35,7 @@ set src in usr ..() if(air_contents.oxygen < 1 && loc==usr) - usr << text("\red The meter on the [src.name] indicates you are almost out of air!") + usr << "\red The meter on the [src.name] indicates you are almost out of air!" usr << sound('alert.ogg') @@ -43,6 +44,7 @@ desc = "Contains dangerous plasma. Do not inhale." icon_state = "plasma" flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = null //they have no straps! /obj/item/weapon/tank/blob_act() if(prob(50)) @@ -282,7 +284,7 @@ else descriptive = "furiously hot" - usr << text("\blue \The \icon[][src] feels []", icon, descriptive) + usr << "\blue \The \icon[icon][src] feels [descriptive]" return diff --git a/code/game/objects/tanks/emergency.dm b/code/game/objects/tanks/emergency.dm index 71ca3243f1..83a7822b3c 100644 --- a/code/game/objects/tanks/emergency.dm +++ b/code/game/objects/tanks/emergency.dm @@ -2,7 +2,8 @@ name = "emergency oxygen tank" desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." icon_state = "emergency" - flags = FPRINT | TABLEPASS | ONBELT | CONDUCT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT w_class = 2.0 force = 4.0 distribute_pressure = ONE_ATMOSPHERE*O2STANDARD diff --git a/code/game/objects/uplinks.dm b/code/game/objects/uplinks.dm index 203cbb77bb..568e597499 100644 --- a/code/game/objects/uplinks.dm +++ b/code/game/objects/uplinks.dm @@ -312,7 +312,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid var/temp = null //Temporary storage area for a message offering the option to destroy the radio var/selfdestruct = 0 //Set to 1 while the radio is self destructing itself. var/obj/item/device/radio/origradio = null - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT w_class = 2.0 item_state = "radio" throwforce = 5 diff --git a/code/game/objects/watercloset.dm b/code/game/objects/watercloset.dm index da6d46bdc0..afc4138561 100644 --- a/code/game/objects/watercloset.dm +++ b/code/game/objects/watercloset.dm @@ -1,4 +1,4 @@ -//todo: flushing, flushing heads, showers actually cleaning people +//todo: toothbrushes, and some sort of "toilet-filthinator" for the hos /obj/structure/toilet name = "toilet" @@ -8,18 +8,43 @@ density = 0 anchored = 1 var/open = 0 + var/mob/swirlie = null /obj/structure/toilet/New() open = round(rand(0, 1)) update_icon() /obj/structure/toilet/attack_hand() - open = !open - update_icon() + if(!swirlie) + open = !open + update_icon() + else + usr.visible_message("[usr] slams the toilet seat onto [swirlie.name]'s head!", "You slam the toilet seat onto [swirlie.name]'s head!", "You hear reverberating porcelain.") + swirlie.adjustBruteLoss(8) /obj/structure/toilet/update_icon() icon_state = "toilet[open]" +/obj/structure/toilet/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/weapon/grab)) + var/obj/item/weapon/grab/G = I + var/mob/GM = G.affecting + if(ismob(G.affecting)) + if(G.state>1 && GM.loc == get_turf(src)) + if(open && !swirlie) + user.visible_message("[user] starts to give [GM.name] a swirlie!", "You start to give [GM.name] a swirlie!") + swirlie = GM + if(do_after(user, 30, 5, 0)) + user.visible_message("[user] gives [GM.name] a swirlie!", "You give [GM.name] a swirlie!", "You hear a toilet flushing.") + if(!GM.internal) + GM.adjustOxyLoss(5) + swirlie = null + else + user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + GM.adjustBruteLoss(8) + else + user << "You need a tighter grip." + /obj/structure/urinal @@ -30,9 +55,20 @@ density = 0 anchored = 1 +/obj/structure/urinal/attackby(var/obj/item/I, var/mob/user) + if(istype(I, /obj/item/weapon/grab)) + var/obj/item/weapon/grab/G = I + var/mob/GM = G.affecting + if(ismob(G.affecting)) + if(G.state>1 && GM.loc == get_turf(src)) + user.visible_message("[user] slams [GM.name] into the [src]!", "You slam [GM.name] into the [src]!") + GM.adjustBruteLoss(8) + else + user << "You need a tighter grip." -/obj/structure/shower + +/obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division." icon = 'watercloset.dmi' @@ -41,7 +77,9 @@ anchored = 1 var/on = 0 var/obj/effect/mist/mymist = null - var/ismist = 0 //needs a var so we can make it linger~ + var/ismist = 0 //needs a var so we can make it linger~ + var/watertemp = "normal" //freezing, normal, or boiling + var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process() //add heat controls? when emagged, you can freeze to death in it? @@ -52,22 +90,37 @@ layer = MOB_LAYER + 1 mouse_opacity = 0 -/obj/structure/shower/attack_hand(mob/M as mob) +/obj/machinery/shower/attack_hand(mob/M as mob) on = !on update_icon() if(on && M.loc == loc) wash(M) + check_heat(M) -/obj/structure/shower/attackby(mob/M as mob) - attack_hand(M) +/obj/machinery/shower/attackby(var/obj/item/I, var/mob/user) + if(I.type == /obj/item/device/analyzer) + user << "The water temperature seems to be [watertemp]." + if(istype(I, /obj/item/weapon/wrench)) + user << "You begin to adjust the temperature valve with the [I]." + if(do_after(user, 50)) + switch(watertemp) + if("normal") + watertemp = "freezing" + if("freezing") + watertemp = "boiling" + if("boiling") + watertemp = "normal" + user.visible_message("[user] adjusts the shower with the [I].", "You adjust the shower with the [I].") -/obj/structure/shower/update_icon() - overlays = null +/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up + overlays = null //once it's been on for a while, in addition to handling the water overlay. if(mymist) del(mymist) if(on) overlays += image('watercloset.dmi', src, "water", MOB_LAYER + 1, dir) + if(watertemp == "freezing") + return if(!ismist) spawn(50) if(src && on) @@ -84,13 +137,20 @@ del(mymist) ismist = 0 -/obj/structure/shower/HasEntered(atom/movable/O as obj|mob) +/obj/machinery/shower/HasEntered(atom/movable/O) ..() wash(O) + if(ismob(O)) + mobpresent += 1 + check_heat(O) + +/obj/machinery/shower/Uncrossed(atom/movable/O) + if(ismob(O)) + mobpresent -= 1 + ..() //Yes, showers are super powerful as far as washing goes. -/obj/structure/shower/proc/wash(atom/movable/O as obj|mob) - ..() +/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob) if(!on) return O.clean_blood() @@ -108,10 +168,10 @@ var/mob/living/carbon/human/washer = O if(washer.head) washer.head.clean_blood() - if(washer.w_uniform) - washer.w_uniform.clean_blood() if(washer.wear_suit) washer.wear_suit.clean_blood() + else if(washer.w_uniform) + washer.w_uniform.clean_blood() if(washer.shoes) washer.shoes.clean_blood() if(washer.gloves) @@ -129,6 +189,26 @@ for(var/obj/effect/overlay/R in tile) del(R) +/obj/machinery/shower/process() + if(!on || !mobpresent) return + for(var/mob/living/carbon/C in loc) + check_heat(C) + +/obj/machinery/shower/proc/check_heat(mob/M as mob) + if(!on || watertemp == "normal") return + if(iscarbon(M)) + var/mob/living/carbon/C = M + + if(watertemp == "freezing") + C.bodytemperature = min(100, C.bodytemperature - 80) + C << "The water is freezing!" + return + if(watertemp == "boiling") + C.bodytemperature = max(500, C.bodytemperature + 35) + C.adjustFireLoss(10) + C << "The water is searing!" + return + /obj/item/weapon/bikehorn/rubberducky @@ -177,7 +257,7 @@ else C.clean_blood() //other things that can't wear gloves should just wash the mob. for(var/mob/V in viewers(src, null)) - V.show_message(text("\blue [M] washes their hands using \the [src].")) + V.show_message("\blue [M] washes their hands using \the [src].") /obj/structure/sink/attackby(var/obj/item/O as obj, var/mob/user as mob) if(busy) diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 5135238bab..8275218a5c 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -11,9 +11,6 @@ item_state = "flashbang" w_class = 2.0 force = 2.0 - throw_speed = 4 - throw_range = 20 - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY var/obj/item/weapon/reagent_containers/glass/beaker_one var/obj/item/weapon/reagent_containers/glass/beaker_two var/obj/item/device/assembly/attached_device @@ -27,6 +24,10 @@ var/list/allowed_containers = list("/obj/item/weapon/reagent_containers/glass/beaker", "/obj/item/weapon/reagent_containers/glass/dispenser", "/obj/item/weapon/reagent_containers/glass/bottle") var/affected_area = 3 var/mob/attacher = "Unknown" + throw_speed = 4 + throw_range = 20 + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BELT attackby(var/obj/item/weapon/W, var/mob/user) if(path || !active) @@ -784,7 +785,7 @@ /obj/structure/table, /obj/structure/closet/secure_closet, /obj/structure/closet, - /obj/machinery/sink, + /obj/structure/sink, /obj/item/weapon/storage, /obj/machinery/atmospherics/unary/cryo_cell, /obj/item/weapon/chem_grenade, @@ -1304,7 +1305,8 @@ amount_per_transfer_from_this = 5 volume = 30 possible_transfer_amounts = null - flags = FPRINT | ONBELT | TABLEPASS | OPENCONTAINER + flags = FPRINT | TABLEPASS | OPENCONTAINER + slot_flags = SLOT_BELT /obj/item/weapon/reagent_containers/hypospray/attack_paw(mob/user as mob) return src.attack_hand(user) diff --git a/code/modules/clothing/ears.dm b/code/modules/clothing/ears.dm index 05493ff2e1..25c12fd946 100644 --- a/code/modules/clothing/ears.dm +++ b/code/modules/clothing/ears.dm @@ -4,6 +4,7 @@ name = "ears" w_class = 1.0 throwforce = 2 + slot_flags = SLOT_EARS var/twoeared = 0 /obj/item/clothing/ears/attack_hand(mob/user as mob) diff --git a/code/modules/clothing/gimmick.dm b/code/modules/clothing/gimmick.dm index 27e5f8579d..0d250a587d 100644 --- a/code/modules/clothing/gimmick.dm +++ b/code/modules/clothing/gimmick.dm @@ -296,7 +296,8 @@ icon = 'weapons.dmi' icon_state = "baton" item_state = "classic_baton" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT force = 10 /obj/item/clothing/under/pirate diff --git a/code/modules/clothing/glasses.dm b/code/modules/clothing/glasses.dm index 53f7e1eaf8..90da1d9393 100644 --- a/code/modules/clothing/glasses.dm +++ b/code/modules/clothing/glasses.dm @@ -3,11 +3,11 @@ icon = 'glasses.dmi' w_class = 2.0 flags = GLASSESCOVERSEYES - var - vision_flags = 0 - darkness_view = 0//Base human is 2 - invisa_view = 0 - prescription = 0 + slot_flags = SLOT_EYES + var/vision_flags = 0 + var/darkness_view = 0//Base human is 2 + var/invisa_view = 0 + var/prescription = 0 /* SEE_SELF // can see self, no matter what diff --git a/code/modules/clothing/gloves.dm b/code/modules/clothing/gloves.dm index e2192512d4..670802d16e 100644 --- a/code/modules/clothing/gloves.dm +++ b/code/modules/clothing/gloves.dm @@ -12,6 +12,7 @@ var/wired = 0 var/obj/item/weapon/cell/cell = 0 body_parts_covered = HANDS + slot_flags = SLOT_GLOVES /obj/item/clothing/gloves/boxing diff --git a/code/modules/clothing/head/hats.dm b/code/modules/clothing/head/hats.dm index ca94d809f9..f600c2cc01 100644 --- a/code/modules/clothing/head/hats.dm +++ b/code/modules/clothing/head/hats.dm @@ -3,6 +3,7 @@ name = "head" icon = 'hats.dmi' body_parts_covered = HEAD + slot_flags = SLOT_HEAD var/list/allowed = list() /obj/item/clothing/head/cakehat @@ -83,8 +84,24 @@ icon_state = "beret" flags = FPRINT | TABLEPASS +/obj/item/clothing/head/chaplain_hood + name = "chaplain's hood" + desc = "It's hood that covers the head. It keeps you warm during the space winters." + icon_state = "chaplain_hood" + flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR + +/obj/item/clothing/head/hasturhood + name = "hastur's hood" + desc = "It's unspeakably stylish" + icon_state = "hasturhood" + flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR + +/obj/item/clothing/head/nursehat + name = "nurse's hat" + desc = "It allows quick identification of trained medical personnel." + icon_state = "nursehat" + flags = FPRINT|TABLEPASS -// CHUMP HELMETS: COOKING THEM DESTROYS THE CHUMP HELMET SPAWN. /obj/item/clothing/head/helmet/cueball name = "cueball helmet" @@ -109,6 +126,8 @@ item_state = "helmet" var/flipped = 0 + +// CHUMP HELMETS: COOKING THEM DESTROYS THE CHUMP HELMET SPAWN. /obj/item/clothing/head/syndicatefake name = "red space-helmet replica" desc = "A plastic replica of a red space space helmet. This is a toy, it is not made for use in space!" @@ -118,24 +137,6 @@ flags = FPRINT | TABLEPASS | BLOCKHAIR flags_inv = HIDEMASK|HIDEEARS|HIDEEYES -/obj/item/clothing/head/chaplain_hood - name = "chaplain's hood" - desc = "It's hood that covers the head. It keeps you warm during the space winters." - icon_state = "chaplain_hood" - flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR - -/obj/item/clothing/head/hasturhood - name = "hastur's hood" - desc = "It's unspeakably stylish" - icon_state = "hasturhood" - flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR - -/obj/item/clothing/head/nursehat - name = "nurse's hat" - desc = "It allows quick identification of trained medical personnel." - icon_state = "nursehat" - flags = FPRINT|TABLEPASS - /obj/item/clothing/head/helmet/cardborg name = "cardborg helmet" desc = "A helmet made out of a box." diff --git a/code/modules/clothing/jumpsuit.dm b/code/modules/clothing/jumpsuit.dm index 52cd992c82..97f58f0605 100644 --- a/code/modules/clothing/jumpsuit.dm +++ b/code/modules/clothing/jumpsuit.dm @@ -8,6 +8,7 @@ heat_transfer_coefficient = 0.30 permeability_coefficient = 0.90 flags = FPRINT | TABLEPASS + slot_flags = SLOT_ICLOTHING var/has_sensor = 1//For the crew computer 2 = unable to change mode var/sensor_mode = 0 /* diff --git a/code/modules/clothing/mask.dm b/code/modules/clothing/mask.dm index 1a8fc6d83b..22180af9db 100644 --- a/code/modules/clothing/mask.dm +++ b/code/modules/clothing/mask.dm @@ -73,6 +73,7 @@ desc = "A face-covering mask that can be connected to an air supply." icon_state = "gas_alt" flags = FPRINT|TABLEPASS|SUITSPACE|MASKCOVERSMOUTH|MASKCOVERSEYES + flags_inv = HIDEEARS|HIDEEYES w_class = 3.0 see_face = 0.0 item_state = "gas_alt" diff --git a/code/modules/clothing/shoes.dm b/code/modules/clothing/shoes.dm index 6e0a4a8d68..493cf794cb 100644 --- a/code/modules/clothing/shoes.dm +++ b/code/modules/clothing/shoes.dm @@ -5,6 +5,7 @@ gender = PLURAL //Carn: for grammarically correct text-parsing body_parts_covered = FEET + slot_flags = SLOT_FEET protective_temperature = 500 heat_transfer_coefficient = 0.10 diff --git a/code/modules/clothing/suit.dm b/code/modules/clothing/suit.dm index 55f1cbaaa8..67d8cb2268 100644 --- a/code/modules/clothing/suit.dm +++ b/code/modules/clothing/suit.dm @@ -5,3 +5,4 @@ flags = FPRINT | TABLEPASS var/list/allowed = list(/obj/item/weapon/tank/emergency_oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + slot_flags = SLOT_OCLOTHING diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index b820fd6c17..3d7a71a722 100644 --- a/code/modules/food/food.dm +++ b/code/modules/food/food.dm @@ -1096,7 +1096,7 @@ reagents.add_reagent("nutriment",12) afterattack(obj/O as obj, mob/user as mob) - if(istype(O,/obj/machinery/sink) && !wrapped) + if(istype(O,/obj/structure/sink) && !wrapped) user << "You place [name] under a stream of water..." loc = get_turf(O) return Expand() diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 9b4425c396..ec578027f4 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -154,7 +154,8 @@ proc/move_mining_shuttle() name = "Miner's pickaxe" icon = 'items.dmi' icon_state = "pickaxe" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 15.0 throwforce = 4.0 item_state = "pickaxe" @@ -238,7 +239,8 @@ proc/move_mining_shuttle() name = "Shovel" icon = 'items.dmi' icon_state = "shovel" - flags = FPRINT | TABLEPASS| CONDUCT | ONBELT + flags = FPRINT | TABLEPASS| CONDUCT + slot_flags = SLOT_BELT force = 8.0 throwforce = 4.0 item_state = "shovel" diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm index 581b97a684..75c99097c5 100644 --- a/code/modules/mining/satchel_ore_box.dm +++ b/code/modules/mining/satchel_ore_box.dm @@ -6,7 +6,8 @@ name = "Mining Satchel" var/mode = 1; //0 = pick one at a time, 1 = pick all on tile var/capacity = 50; //the number of ore pieces it can carry. - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT w_class = 1 /obj/item/weapon/satchel/attack_self(mob/user as mob) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 59fbac4e14..271c6613e5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -554,7 +554,7 @@ return if (!istype(W, /obj/item)) return - if (!( W.flags & ONBACK )) + if (!( W.slot_flags & SLOT_BACK )) return if(istype(W,/obj/item/weapon/twohanded) && W:wielded) usr << "Unwield the [initial(W.name)] first!" @@ -578,7 +578,10 @@ if (emptyHand) wear_suit.DblClick() return - if (!( istype(W, /obj/item/clothing/suit) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_OCLOTHING )) + return return u_equip(W) wear_suit = W @@ -588,7 +591,9 @@ if (emptyHand) gloves.DblClick() return - if (!( istype(W, /obj/item/clothing/gloves) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_GLOVES )) return u_equip(W) gloves = W @@ -598,7 +603,9 @@ if (emptyHand) shoes.DblClick() return - if (!( istype(W, /obj/item/clothing/shoes) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_FEET )) return u_equip(W) shoes = W @@ -608,7 +615,9 @@ if (emptyHand) belt.DblClick() return - if (!W || !W.flags || !( W.flags & ONBELT )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_BELT )) return u_equip(W) belt = W @@ -618,7 +627,9 @@ if (emptyHand) glasses.DblClick() return - if (!( istype(W, /obj/item/clothing/glasses) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_EYES )) return u_equip(W) glasses = W @@ -628,10 +639,9 @@ if (emptyHand) head.DblClick() return - if (( istype(W, /obj/item/weapon/paper) )) - u_equip(W) - head = W - else if (!( istype(W, /obj/item/clothing/head) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_HEAD )) return u_equip(W) head = W @@ -683,7 +693,10 @@ if (emptyHand) w_uniform.DblClick() return - if (!( istype(W, /obj/item/clothing/under) )) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_ICLOTHING )) + return return u_equip(W) w_uniform = W @@ -695,7 +708,9 @@ return if (!w_uniform) return - if (!istype(W, /obj/item/weapon/card/id) && !istype(W, /obj/item/device/pda) ) + if (!istype(W, /obj/item)) + return + if (!( W.slot_flags & SLOT_ID )) return u_equip(W) wear_id = W @@ -705,19 +720,25 @@ if (emptyHand) l_store.DblClick() return - if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform ))) + if (!istype(W, /obj/item)) return - u_equip(W) - l_store = W + if ( ( W.slot_flags & SLOT_DENYPOCKET ) ) + return + if ( W.w_class <= 2 || ( W.slot_flags & SLOT_POCKET ) ) + u_equip(W) + l_store = W if("storage2") if (r_store) if (emptyHand) r_store.DblClick() return - if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform ))) + if (!istype(W, /obj/item)) return - u_equip(W) - r_store = W + if ( ( W.slot_flags & SLOT_DENYPOCKET ) ) + return + if ( W.w_class <= 2 || ( W.slot_flags & SLOT_POCKET ) ) + u_equip(W) + r_store = W if("suit storage") if (s_store) if (emptyHand) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index c5f213f906..d47347c433 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -1,10 +1,9 @@ /mob/new_player - var - datum/preferences/preferences = null - ready = 0 - spawning = 0//Referenced when you want to delete the new_player later on in the code. - totalPlayers = 0 //Player counts for the Lobby tab - totalPlayersReady = 0 + var/datum/preferences/preferences = null + var/ready = 0 + var/spawning = 0//Referenced when you want to delete the new_player later on in the code. + var/totalPlayers = 0 //Player counts for the Lobby tab + var/totalPlayersReady = 0 invisibility = 101 diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 5a469ee25e..c56e123ebd 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -9,7 +9,8 @@ throw_range = 10 var/obj/item/weapon/pen/haspen //The stored pen. var/obj/item/weapon/paper/toppaper //The topmost piece of paper. - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT pressure_resistance = 10 /obj/item/weapon/clipboard/New() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 9a6910be38..431231fda9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -9,280 +9,277 @@ throw_range = 15 layer = 4 pressure_resistance = 1 + slot_flags = SLOT_HEAD + see_face = 1 + body_parts_covered = HEAD + protective_temperature = 0 - var - info //What's actually written on the paper. - info_links //A different version of the paper which includes html links at fields and EOF - stamps //The (text for the) stamps on the paper. - fields //Amount of user created fields - list/stamped - see_face = 1 - body_parts_covered = HEAD - protective_temperature = 0 - rigged = 0 - spam_flag = 0 + var/info //What's actually written on the paper. + var/info_links //A different version of the paper which includes html links at fields and EOF + var/stamps //The (text for the) stamps on the paper. + var/fields //Amount of user created fields + var/list/stamped + var/rigged = 0 + var/spam_flag = 0 - const - deffont = "Verdana" - signfont = "Times New Roman" - crayonfont = "Comic Sans MS" + var/const/deffont = "Verdana" + var/const/signfont = "Times New Roman" + var/const/crayonfont = "Comic Sans MS" - New() - ..() - src.pixel_y = rand(-8, 8) - src.pixel_x = rand(-9, 9) - spawn(2) - if(src.info) - src.overlays += "paper_words" - updateinfolinks() - return - - update_icon() +/obj/item/weapon/paper/New() + ..() + src.pixel_y = rand(-8, 8) + src.pixel_x = rand(-9, 9) + spawn(2) if(src.info) src.overlays += "paper_words" - return - - examine() - set src in oview(1) - - // ..() //We don't want them to see the dumb "this is a paper" thing every time. - if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon))) - usr << browse("[name][stars(info)][stamps]", "window=[name]") - onclose(usr, "[name]") - else - usr << browse("[name][info][stamps]", "window=[name]") - onclose(usr, "[name]") - return - - verb/rename() - set name = "Rename paper" - set category = "Object" - set src in usr - - if ((usr.mutations & CLUMSY) && prob(50)) - usr << "\red You cut yourself on the paper." - return - var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text),1,MAX_NAME_LEN) - n_name = copytext(n_name, 1, 32) - if ((loc == usr && usr.stat == 0)) - name = "paper[(n_name ? text("- '[n_name]'") : null)]" - add_fingerprint(usr) - return - - attack_self(mob/living/user as mob) - examine() - if(rigged && (Holiday == "April Fool's Day")) - if(spam_flag == 0) - spam_flag = 1 - playsound(src.loc, 'bikehorn.ogg', 50, 1) - spawn(20) - spam_flag = 0 - return - - attack_ai(var/mob/living/silicon/ai/user as mob) - var/dist - if (istype(user) && user.current) //is AI - dist = get_dist(src, user.current) - else //cyborg or AI not seeing through a camera - dist = get_dist(src, user) - if (dist < 2) - usr << browse("[name][info][stamps]", "window=[name]") - onclose(usr, "[name]") - else - usr << browse("[name][stars(info)][stamps]", "window=[name]") - onclose(usr, "[name]") - return - - proc - addtofield(var/id, var/text, var/links = 0) - var/locid = 0 - var/laststart = 1 - var/textindex = 1 - while(1) // I know this can cause infinite loops and fuck up the whole server, but the if(istart==0) should be safe as fuck - var/istart = 0 - if(links) - istart = findtext(info_links, "", laststart) - else - istart = findtext(info, "", laststart) - - if(istart==0) - return // No field found with matching id - - laststart = istart+1 - locid++ - if(locid == id) - var/iend = 1 - if(links) - iend = findtext(info_links, "", istart) - else - iend = findtext(info, "", istart) - - //textindex = istart+26 - textindex = iend - break - - if(links) - var/before = copytext(info_links, 1, textindex) - var/after = copytext(info_links, textindex) - info_links = before + text + after - else - var/before = copytext(info, 1, textindex) - var/after = copytext(info, textindex) - info = before + text + after - updateinfolinks() - updateinfolinks() - info_links = info - var/i = 0 - for(i=1,i<=fields,i++) - addtofield(i, "write", 1) - info_links = info_links + "write" + return - parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0) - t = copytext(sanitize(t),1,MAX_MESSAGE_LEN) +/obj/item/weapon/paper/update_icon() + if(src.info) + src.overlays += "paper_words" + return - t = dd_replacetext(t, "\[center\]", "
") - t = dd_replacetext(t, "\[/center\]", "
") - t = dd_replacetext(t, "\[br\]", "
") - t = dd_replacetext(t, "\[b\]", "") - t = dd_replacetext(t, "\[/b\]", "") - t = dd_replacetext(t, "\[i\]", "") - t = dd_replacetext(t, "\[/i\]", "") - t = dd_replacetext(t, "\[u\]", "") - t = dd_replacetext(t, "\[/u\]", "") - t = dd_replacetext(t, "\[large\]", "") - t = dd_replacetext(t, "\[/large\]", "") - t = dd_replacetext(t, "\[sign\]", "[user.real_name]") - t = dd_replacetext(t, "\[field\]", "") +/obj/item/weapon/paper/examine() + set src in oview(1) - if(!iscrayon) - t = dd_replacetext(t, "\[*\]", "
  • ") - t = dd_replacetext(t, "\[hr\]", "
    ") - t = dd_replacetext(t, "\[small\]", "") - t = dd_replacetext(t, "\[/small\]", "") - t = dd_replacetext(t, "\[list\]", "
      ") - t = dd_replacetext(t, "\[/list\]", "
    ") +// ..() //We don't want them to see the dumb "this is a paper" thing every time. + if(!(istype(usr, /mob/living/carbon/human) || istype(usr, /mob/dead/observer) || istype(usr, /mob/living/silicon))) + usr << browse("[name][stars(info)][stamps]", "window=[name]") + onclose(usr, "[name]") + else + usr << browse("[name][info][stamps]", "window=[name]") + onclose(usr, "[name]") + return - t = "[t]" - else // If it is a crayon, and he still tries to use these, make them empty! - t = dd_replacetext(t, "\[*\]", "") - t = dd_replacetext(t, "\[hr\]", "") - t = dd_replacetext(t, "\[small\]", "") - t = dd_replacetext(t, "\[/small\]", "") - t = dd_replacetext(t, "\[list\]", "") - t = dd_replacetext(t, "\[/list\]", "") +/obj/item/weapon/paper/verb/rename() + set name = "Rename paper" + set category = "Object" + set src in usr - t = "[t]" + if ((usr.mutations & CLUMSY) && prob(50)) + usr << "\red You cut yourself on the paper." + return + var/n_name = copytext(sanitize(input(usr, "What would you like to label the paper?", "Paper Labelling", null) as text),1,MAX_NAME_LEN) + if ((loc == usr && usr.stat == 0)) + name = "paper[(n_name ? text("- '[n_name]'") : null)]" + add_fingerprint(usr) + return - //Count the fields - var/laststart = 1 - while(1) - var/i = findtext(t, "", laststart) - if(i==0) - break - laststart = i+1 - fields++ +/obj/item/weapon/paper/attack_self(mob/living/user as mob) + examine() + if(rigged && (Holiday == "April Fool's Day")) + if(spam_flag == 0) + spam_flag = 1 + playsound(src.loc, 'bikehorn.ogg', 50, 1) + spawn(20) + spam_flag = 0 + return - return t +/obj/item/weapon/paper/attack_ai(var/mob/living/silicon/ai/user as mob) + var/dist + if (istype(user) && user.current) //is AI + dist = get_dist(src, user.current) + else //cyborg or AI not seeing through a camera + dist = get_dist(src, user) + if (dist < 2) + usr << browse("[name][info][stamps]", "window=[name]") + onclose(usr, "[name]") + else + usr << browse("[name][stars(info)][stamps]", "window=[name]") + onclose(usr, "[name]") + return - openhelp(mob/user as mob) - user << browse({"Pen Help - -
    Crayon&Pen commands

    -
    - \[br\] : Creates a linebreak.
    - \[center\] - \[/center\] : Centers the text.
    - \[b\] - \[/b\] : Makes the text bold.
    - \[i\] - \[/i\] : Makes the text italic.
    - \[u\] - \[/u\] : Makes the text underlined.
    - \[large\] - \[/large\] : Increases the size of the text.
    - \[sign\] : Inserts a signature of your name in a foolproof way.
    - \[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
    -
    -
    Pen exclusive commands

    - \[small\] - \[/small\] : Decreases the size of the text.
    - \[list\] - \[/list\] : A list.
    - \[*\] : A dot used for lists.
    - \[hr\] : Adds a horizontal rule. - "}, "window=paper_help") +/obj/item/weapon/paper/proc/addtofield(var/id, var/text, var/links = 0) + var/locid = 0 + var/laststart = 1 + var/textindex = 1 + while(1) // I know this can cause infinite loops and fuck up the whole server, but the if(istart==0) should be safe as fuck + var/istart = 0 + if(links) + istart = findtext(info_links, "", laststart) + else + istart = findtext(info, "", laststart) + if(istart==0) + return // No field found with matching id - Topic(href, href_list) - ..() - if ((usr.stat || usr.restrained())) - return - - if(href_list["write"]) - var/id = href_list["write"] - var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as text - - var/obj/item/i = usr.equipped() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. - var/iscrayon = 0 - if(!istype(i, /obj/item/weapon/pen)) - if(!istype(i, /obj/item/toy/crayon)) - return - iscrayon = 1 - - - if ((!in_range(src, usr) && src.loc != usr && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != usr && usr.equipped() != i)) // Some check to see if he's allowed to write - return - - t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html - - if(id!="end") - addtofield(text2num(id), t) // He wants to edit a field, let him. + laststart = istart+1 + locid++ + if(locid == id) + var/iend = 1 + if(links) + iend = findtext(info_links, "", istart) else - info += t // Oh, he wants to edit to the end of the file, let him. - updateinfolinks() + iend = findtext(info, "", istart) - usr << browse("[name][info_links][stamps]", "window=[name]") // Update the window + //textindex = istart+26 + textindex = iend + break - if(!overlays.Find("paper_words")) - overlays += "paper_words" + if(links) + var/before = copytext(info_links, 1, textindex) + var/after = copytext(info_links, textindex) + info_links = before + text + after + else + var/before = copytext(info, 1, textindex) + var/after = copytext(info, textindex) + info = before + text + after + updateinfolinks() - attackby(obj/item/weapon/P as obj, mob/user as mob) - ..() - var/clown = 0 - if(user.mind && (user.mind.assigned_role == "Clown")) - clown = 1 +/obj/item/weapon/paper/proc/updateinfolinks() + info_links = info + var/i = 0 + for(i=1,i<=fields,i++) + addtofield(i, "write", 1) + info_links = info_links + "write" - if (istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) - usr << browse("[name][info_links][stamps]", "window=[name]") - //openhelp(user) - return - else if(istype(P, /obj/item/weapon/stamp)) - if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P)) +/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0) + t = copytext(sanitize(t),1,MAX_MESSAGE_LEN) + + t = dd_replacetext(t, "\[center\]", "
    ") + t = dd_replacetext(t, "\[/center\]", "
    ") + t = dd_replacetext(t, "\[br\]", "
    ") + t = dd_replacetext(t, "\[b\]", "") + t = dd_replacetext(t, "\[/b\]", "") + t = dd_replacetext(t, "\[i\]", "") + t = dd_replacetext(t, "\[/i\]", "") + t = dd_replacetext(t, "\[u\]", "") + t = dd_replacetext(t, "\[/u\]", "") + t = dd_replacetext(t, "\[large\]", "") + t = dd_replacetext(t, "\[/large\]", "") + t = dd_replacetext(t, "\[sign\]", "[user.real_name]") + t = dd_replacetext(t, "\[field\]", "") + + if(!iscrayon) + t = dd_replacetext(t, "\[*\]", "
  • ") + t = dd_replacetext(t, "\[hr\]", "
    ") + t = dd_replacetext(t, "\[small\]", "") + t = dd_replacetext(t, "\[/small\]", "") + t = dd_replacetext(t, "\[list\]", "
      ") + t = dd_replacetext(t, "\[/list\]", "
    ") + + t = "[t]" + else // If it is a crayon, and he still tries to use these, make them empty! + t = dd_replacetext(t, "\[*\]", "") + t = dd_replacetext(t, "\[hr\]", "") + t = dd_replacetext(t, "\[small\]", "") + t = dd_replacetext(t, "\[/small\]", "") + t = dd_replacetext(t, "\[list\]", "") + t = dd_replacetext(t, "\[/list\]", "") + + t = "[t]" + + //Count the fields + var/laststart = 1 + while(1) + var/i = findtext(t, "", laststart) + if(i==0) + break + laststart = i+1 + fields++ + + return t + +/obj/item/weapon/paper/proc/openhelp(mob/user as mob) + user << browse({"Pen Help + +
    Crayon&Pen commands

    +
    + \[br\] : Creates a linebreak.
    + \[center\] - \[/center\] : Centers the text.
    + \[b\] - \[/b\] : Makes the text bold.
    + \[i\] - \[/i\] : Makes the text italic.
    + \[u\] - \[/u\] : Makes the text underlined.
    + \[large\] - \[/large\] : Increases the size of the text.
    + \[sign\] : Inserts a signature of your name in a foolproof way.
    + \[field\] : Inserts an invisible field which lets you start type from there. Useful for forms.
    +
    +
    Pen exclusive commands

    + \[small\] - \[/small\] : Decreases the size of the text.
    + \[list\] - \[/list\] : A list.
    + \[*\] : A dot used for lists.
    + \[hr\] : Adds a horizontal rule. + "}, "window=paper_help") + + +/obj/item/weapon/paper/Topic(href, href_list) + ..() + if ((usr.stat || usr.restrained())) + return + + if(href_list["write"]) + var/id = href_list["write"] + var/t = strip_html_simple(input(usr, "What text do you wish to add to " + (id=="end" ? "the end of the paper" : "field "+id) + "?", "[name]", null),8192) as text + + var/obj/item/i = usr.equipped() // Check to see if he still got that darn pen, also check if he's using a crayon or pen. + var/iscrayon = 0 + if(!istype(i, /obj/item/weapon/pen)) + if(!istype(i, /obj/item/toy/crayon)) return + iscrayon = 1 - stamps += (stamps=="" ? "
    " : "
    ") + "This paper has been stamped with the [P.name]." - switch(P.type) - if(/obj/item/weapon/stamp/captain) - overlays += "paper_stamped_cap" - if(/obj/item/weapon/stamp/hop) - overlays += "paper_stamped_hop" - if(/obj/item/weapon/stamp/hos) - overlays += "paper_stamped_hos" - if(/obj/item/weapon/stamp/ce) - overlays += "paper_stamped_ce" - if(/obj/item/weapon/stamp/rd) - overlays += "paper_stamped_rd" - if(/obj/item/weapon/stamp/cmo) - overlays += "paper_stamped_cmo" - if(/obj/item/weapon/stamp/denied) - overlays += "paper_stamped_denied" - if(/obj/item/weapon/stamp/clown) - if (!clown) - usr << "\red You are totally unable to use the stamp. HONK!" - return - else - overlays += "paper_stamped_clown" + if ((!in_range(src, usr) && src.loc != usr && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != usr && usr.equipped() != i)) // Some check to see if he's allowed to write + return + + t = parsepencode(t, i, usr, iscrayon) // Encode everything from pencode to html + + if(id!="end") + addtofield(text2num(id), t) // He wants to edit a field, let him. + else + info += t // Oh, he wants to edit to the end of the file, let him. + updateinfolinks() + + usr << browse("[name][info_links][stamps]", "window=[name]") // Update the window + + if(!overlays.Find("paper_words")) + overlays += "paper_words" + +/obj/item/weapon/paper/attackby(obj/item/weapon/P as obj, mob/user as mob) + ..() + var/clown = 0 + if(user.mind && (user.mind.assigned_role == "Clown")) + clown = 1 + + if (istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) + usr << browse("[name][info_links][stamps]", "window=[name]") + //openhelp(user) + return + else if(istype(P, /obj/item/weapon/stamp)) + if ((!in_range(src, usr) && src.loc != user && !( istype(src.loc, /obj/item/weapon/clipboard) ) && src.loc.loc != user && user.equipped() != P)) + return + + stamps += (stamps=="" ? "
    " : "
    ") + "This paper has been stamped with the [P.name]." + + switch(P.type) + if(/obj/item/weapon/stamp/captain) + overlays += "paper_stamped_cap" + if(/obj/item/weapon/stamp/hop) + overlays += "paper_stamped_hop" + if(/obj/item/weapon/stamp/hos) + overlays += "paper_stamped_hos" + if(/obj/item/weapon/stamp/ce) + overlays += "paper_stamped_ce" + if(/obj/item/weapon/stamp/rd) + overlays += "paper_stamped_rd" + if(/obj/item/weapon/stamp/cmo) + overlays += "paper_stamped_cmo" + if(/obj/item/weapon/stamp/denied) + overlays += "paper_stamped_denied" + if(/obj/item/weapon/stamp/clown) + if (!clown) + usr << "\red You are totally unable to use the stamp. HONK!" + return else - overlays += "paper_stamped" - if(!stamped) - stamped = new - stamped += P.type + overlays += "paper_stamped_clown" + else + overlays += "paper_stamped" + if(!stamped) + stamped = new + stamped += P.type - user << "\blue You stamp the paper with your rubber stamp." - add_fingerprint(user) - return \ No newline at end of file + user << "\blue You stamp the paper with your rubber stamp." + add_fingerprint(user) + return \ No newline at end of file diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 54f845211c..c5c5088946 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -3,7 +3,8 @@ name = "pen" icon = 'bureaucracy.dmi' icon_state = "pen" - flags = FPRINT | ONBELT | TABLEPASS + flags = FPRINT | TABLEPASS + slot_flags = SLOT_BELT | SLOT_EARS throwforce = 0 w_class = 1.0 throw_speed = 7 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index a8802a7f1a..6a542a0bbe 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -3,13 +3,13 @@ desc = "A bullet casing." icon = 'ammo.dmi' icon_state = "s-casing" - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT throwforce = 1 w_class = 1.0 - var - caliber = "" //Which kind of guns it can be loaded into - projectile_type = ""//The bullet type to create when New() is called - obj/item/projectile/BB = null //The loaded bullet + var/caliber = "" //Which kind of guns it can be loaded into + var/projectile_type = ""//The bullet type to create when New() is called + var/obj/item/projectile/BB = null //The loaded bullet New() @@ -28,18 +28,18 @@ desc = "A box of ammo" icon_state = "357" icon = 'ammo.dmi' - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT item_state = "syringe_kit" m_amt = 50000 throwforce = 2 w_class = 1.0 throw_speed = 4 throw_range = 10 - var - list/stored_ammo = list() - ammo_type = "/obj/item/ammo_casing" - max_ammo = 7 - multiple_sprites = 0 + var/list/stored_ammo = list() + var/ammo_type = "/obj/item/ammo_casing" + var/max_ammo = 7 + var/multiple_sprites = 0 New() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index e1c1f79d9f..9f5d6156ae 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -4,7 +4,8 @@ icon = 'gun.dmi' icon_state = "detective" item_state = "gun" - flags = FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BELT m_amt = 2000 w_class = 3.0 throwforce = 5 @@ -13,19 +14,18 @@ force = 5.0 origin_tech = "combat=1" - var - fire_sound = 'Gunshot.ogg' - tmp/obj/item/projectile/in_chamber = null - caliber = "" - silenced = 0 - recoil = 0 - ejectshell = 1 - tmp/list/mob/living/target //List of who yer targeting. - tmp/lock_time = -100 - tmp/mouthshoot = 0 ///To stop people from suiciding twice... >.> - automatic = 0 //Used to determine if you can target multiple people. - tmp/mob/living/last_moved_mob //Used to fire faster at more than one person. - tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them. + var/fire_sound = 'Gunshot.ogg' + var/tmp/obj/item/projectile/in_chamber = null + var/caliber = "" + var/silenced = 0 + var/recoil = 0 + var/ejectshell = 1 + var/tmp/list/mob/living/target //List of who yer targeting. + var/tmp/lock_time = -100 + var/tmp/mouthshoot = 0 ///To stop people from suiciding twice... >.> + var/automatic = 0 //Used to determine if you can target multiple people. + var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person. + var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them. proc/load_into_chamber() return 0 @@ -165,14 +165,16 @@ if (!istype(targloc) || !istype(curloc)) return - if(!special_check(user)) return + if(!special_check(user)) + return if(!load_into_chamber()) user.visible_message("*click click*", "\red *click*") for(var/mob/K in viewers(usr)) K << 'empty.ogg' return - if(!in_chamber) return + if(!in_chamber) + return in_chamber.firer = user in_chamber.def_zone = user.zone_sel.selecting @@ -191,7 +193,7 @@ playsound(user, fire_sound, 10, 1) else playsound(user, fire_sound, 50, 1) - user.visible_message("\red [user] fires the [src]!", "\red You fire the [src]!", "\blue You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") + user.visible_message("\red [user] fires \the [src]!", "\red You fire \the [src]!", "\blue You hear a [istype(in_chamber, /obj/item/projectile/beam) ? "laser blast" : "gunshot"]!") in_chamber.original = targloc in_chamber.loc = get_turf(user) @@ -210,7 +212,8 @@ in_chamber.p_y = text2num(mouse_control["icon-y"]) spawn() - if(in_chamber) in_chamber.fired() + if(in_chamber) + in_chamber.fired() sleep(1) in_chamber = null diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5e70bb3741..1ab66cd730 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -4,12 +4,11 @@ desc = "A basic energy-based gun." fire_sound = 'Taser.ogg' - var - obj/item/weapon/cell/power_supply //What type of power cell this uses - charge_cost = 100 //How much energy is needed to fire. - cell_type = "/obj/item/weapon/cell" - projectile_type = "/obj/item/projectile/energy" - modifystate + var/obj/item/weapon/cell/power_supply //What type of power cell this uses + var/charge_cost = 100 //How much energy is needed to fire. + var/cell_type = "/obj/item/weapon/cell" + var/projectile_type = "/obj/item/projectile/energy" + var/modifystate emp_act(severity) power_supply.use(round(power_supply.maxcharge / severity)) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 8df4b8bb45..bf0bc51442 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -10,8 +10,7 @@ origin_tech = "combat=3;magnets=2" modifystate = "energystun" - var - mode = 0 //0 = stun, 1 = kill + var/mode = 0 //0 = stun, 1 = kill attack_self(mob/living/user as mob) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 9fc41c86ce..9a27af9972 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -5,7 +5,8 @@ fire_sound = 'Laser.ogg' origin_tech = "combat=2;magnets=4" w_class = 4.0 - flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BACK charge_cost = 100 projectile_type = "/obj/item/projectile/ion" @@ -27,7 +28,8 @@ obj/item/weapon/gun/energy/staff icon_state = "staffofchange" item_state = "staffofchange" fire_sound = 'emitter.ogg' - flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BACK w_class = 4.0 charge_cost = 200 projectile_type = "/obj/item/projectile/change" diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index 25b9144faf..b6dda0758b 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -8,12 +8,11 @@ m_amt = 1000 force = 10 //Pistol whipp'n good. (It was frigging SIXTY on pre-goon code) - var - ammo_type = "/obj/item/ammo_casing/a357" - list/loaded = list() - max_shells = 7 - load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine - obj/item/ammo_magazine/empty_mag = null + var/ammo_type = "/obj/item/ammo_casing/a357" + var/list/loaded = list() + var/max_shells = 7 + var/load_method = 0 //0 = Single shells or quick loader, 1 = box, 2 = magazine + var/obj/item/ammo_magazine/empty_mag = null New() diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 72daf9dc61..563af0216e 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -6,14 +6,14 @@ max_shells = 4 w_class = 4.0 force = 10 - flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BACK caliber = "shotgun" origin_tech = "combat=4;materials=2" ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" - var - recentpump = 0 // to prevent spammage - pumped = 0 - obj/item/ammo_casing/current_shell = null + var/recentpump = 0 // to prevent spammage + var/pumped = 0 + var/obj/item/ammo_casing/current_shell = null load_into_chamber() @@ -66,7 +66,8 @@ max_shells = 2 w_class = 4.0 force = 10 - flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY | ONBACK + flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY + slot_flags = SLOT_BACK caliber = "shotgun" origin_tech = "combat=3;materials=1" ammo_type = "/obj/item/ammo_casing/shotgun/beanbag" @@ -124,8 +125,8 @@ item_state = "sawnshotgun" w_class = 3.0 item_state = "gun" - flags &= ~ONBACK //you can't sling it on your back - flags |= ONBELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~SLOT_BACK //you can't sling it on your back + slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) name = "sawn-off shotgun" desc = "Omar's coming!" user << "You shorten the barrel of \the [src]!" \ No newline at end of file diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 80ec3ea55e..00b7cc2178 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -492,96 +492,6 @@ else return ..() -//The toilet does not need to pressurized but can only handle small items. -//You can also choke people by dunking them into the toilet. -/obj/machinery/disposal/toilet - name = "toilet" - desc = "A torque rotation-based, waste disposal unit for small matter." - icon_state = "toilet" - density = 0//So you can stand on it. - mode = 2 - - attackby(var/obj/item/I, var/mob/user) - if( !(stat & BROKEN) ) - if(istype(I, /obj/item/weapon/grab)) - var/obj/item/weapon/grab/G = I - if(istype(G)) // handle grabbed mob - if(ismob(G.affecting)) - var/mob/GM = G.affecting - for (var/mob/V in viewers(usr)) - V.show_message("[user] dunks [GM.name] into the toilet!", 3) - if(do_after(user, 30)) - if(G && G.state>1 && !GM.internal) - GM.oxyloss += 5 - - else if(I.w_class < 4) - user.drop_item() - I.loc = src - user << "You place \the [I] into the [src]." - for(var/mob/M in viewers(src)) - if(M == user) - continue - M.show_message("[user.name] places \the [I] into the [src].", 3) - else - user << "\red That item cannot be placed into the toilet." - return - - MouseDrop_T(mob/target, mob/user) - if (!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai)) - return//Damn that list is long - - for (var/mob/V in viewers(usr)) - if(target == user && !user.stat) - V.show_message("[user] sits on the toilet.", 3) - if(target != user && !user.restrained()) - V.show_message("[user] places [target.name] on the toilet.", 3) - target.loc = loc - return - - interact(mob/user) - if(isAI(user) || isrobot(user)) - return - - add_fingerprint(user) - for (var/mob/V in viewers(user)) - V.show_message("[user] eagerly drinks the toilet water!", 3)//Yum yum yum - return - - update() - overlays = null - if( !(stat & BROKEN) ) - if(flush) - overlays += image('disposal.dmi',"toilet-handle",,dir) - if( !(stat & NOPOWER) ) - overlays += image('disposal.dmi',"toilet-ready",,dir) - else - icon_state = "toilet-broken" - mode = 0 - flush = 0 - return - - process() - if( !((stat & BROKEN)||(stat & NOPOWER)) )// nothing can happen if broken or not powered. - updateDialog() - if(!flush&&contents.len) - flush++ - flush() - use_power(100)// base power usage - update() - return - - flush() - flick("toilet-flush", src) - var/obj/structure/disposalholder/H = new() - H.init(src) - sleep(10) - playsound(src, 'disposalflush.ogg', 50, 0, 0) - sleep(30) // To prevent spam. - H.start(src) - flush-- - update() - return - // virtual disposal object // travels through pipes in lieu of actual items // contents will be items flushed by the disposal @@ -600,8 +510,8 @@ // initialize a holder from the contents of a disposal unit proc/init(var/obj/machinery/disposal/D) - if(!istype(D, /obj/machinery/disposal/toilet))//So it does not drain gas from a toilet which does not function on it. - gas = D.air_contents// transfer gas resv. into holder object + gas = D.air_contents// transfer gas resv. into holder object + // now everything inside the disposal gets put into the holder // note AM since can contain mobs or objs diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 21b05206db..27adb3f2a8 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -252,7 +252,8 @@ w_class = 1 item_state = "electronic" - flags = FPRINT | TABLEPASS | ONBELT | CONDUCT + flags = FPRINT | TABLEPASS | CONDUCT + slot_flags = SLOT_BELT attack_self(mob/user as mob) interact(user) diff --git a/code/setup.dm b/code/setup.dm index 0ca27c1895..ae22ad53ad 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -99,8 +99,23 @@ var/MAX_EXPLOSION_RANGE = 14 #define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up +//ITEM INVENTORY SLOT BITMASKS: (HUMANS ONLY!) +#define SLOT_OCLOTHING 1 +#define SLOT_ICLOTHING 2 +#define SLOT_GLOVES 4 +#define SLOT_EYES 8 +#define SLOT_EARS 16 +#define SLOT_MASK 32 +#define SLOT_HEAD 64 +#define SLOT_FEET 128 +#define SLOT_ID 256 +#define SLOT_BELT 512 +#define SLOT_BACK 1024 +#define SLOT_POCKET 2048 //this is to allow items with a w_class of 3 or 4 to fit in pockets. +#define SLOT_DENYPOCKET 4096 //this is to deny items with a w_class of 2 or 1 to fit in pockets. + + //FLAGS BITMASK -#define ONBACK 1 // can be put in back slot #define TABLEPASS 2 // can pass by a table or rack /******************************************************************************** @@ -118,7 +133,6 @@ var/MAX_EXPLOSION_RANGE = 14 #define NODELAY 32768 // 1 second attackby delay skipped (Can be used once every 0.2s). Most objects have a 1s attackby delay, which doesn't require a flag. #define NOSHIELD 32 // weapon not affected by shield #define CONDUCT 64 // conducts electricity (metal etc.) -#define ONBELT 128 // can be put in belt slot #define FPRINT 256 // takes a fingerprint #define ON_BORDER 512 // item has priority to check when entering or leaving @@ -182,35 +196,33 @@ var/MAX_EXPLOSION_RANGE = 14 #define FULL_BODY 2047 //bitflags for mutations -var/const - TK =(1<<0) - COLD_RESISTANCE =(1<<1) - XRAY =(1<<2) - HULK =(1<<3) - CLUMSY =(1<<4) - FAT =(1<<5) - HUSK =(1<<6) - LASER =(1<<7) - HEAL =(1<<8) - mNobreath =(1<<9) - mRemote =(1<<10) - mRegen =(1<<11) - mRun =(1<<12) - mRemotetalk =(1<<13) - mMorph =(1<<14) - mBlend =(1<<15) +var/const/TK =(1<<0) +var/const/COLD_RESISTANCE =(1<<1) +var/const/XRAY =(1<<2) +var/const/HULK =(1<<3) +var/const/CLUMSY =(1<<4) +var/const/FAT =(1<<5) +var/const/HUSK =(1<<6) +var/const/LASER =(1<<7) +var/const/HEAL =(1<<8) +var/const/mNobreath =(1<<9) +var/const/mRemote =(1<<10) +var/const/mRegen =(1<<11) +var/const/mRun =(1<<12) +var/const/mRemotetalk =(1<<13) +var/const/mMorph =(1<<14) +var/const/mBlend =(1<<15) //the "&" operator cannot go higher than (2^16)-1 - mHallucination =(1<<0) - mFingerprints =(1<<1) - mShock =(1<<2) - mSmallsize =(1<<3) - NOCLONE =(1<<4) +var/const/mHallucination =(1<<0) +var/const/mFingerprints =(1<<1) +var/const/mShock =(1<<2) +var/const/mSmallsize =(1<<3) +var/const/NOCLONE =(1<<4) //mob/var/stat things -var/const - CONSCIOUS = 0 - UNCONSCIOUS = 1 - DEAD = 2 +var/const/CONSCIOUS = 0 +var/const/UNCONSCIOUS = 1 +var/const/DEAD = 2 // channel numbers for power #define EQUIP 1 @@ -239,12 +251,11 @@ var/const #define MAX_STACK_AMOUNT_GLASS 50 #define MAX_STACK_AMOUNT_RODS 60 -var/const - GAS_O2 = 1 << 0 - GAS_N2 = 1 << 1 - GAS_PL = 1 << 2 - GAS_CO2 = 1 << 3 - GAS_N2O = 1 << 4 +var/const/GAS_O2 = 1 << 0 +var/const/GAS_N2 = 1 << 1 +var/const/GAS_PL = 1 << 2 +var/const/GAS_CO2 = 1 << 3 +var/const/GAS_N2O = 1 << 4 var/list/accessable_z_levels = list("3" = 15, "4" = 35, "6" = 50) diff --git a/code/unused/pda2/pda2.dm b/code/unused/pda2/pda2.dm index 29d3556292..7aa1f538f5 100644 --- a/code/unused/pda2/pda2.dm +++ b/code/unused/pda2/pda2.dm @@ -34,7 +34,8 @@ icon_state = "pda" item_state = "electronic" w_class = 2.0 - flags = FPRINT | TABLEPASS | ONBELT + flags = FPRINT | TABLEPASS + slow_flags = SLOT_BELT var/owner = null var/default_cartridge = null // Access level defined by cartridge diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index f44dad511e..9972a419d4 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -297,7 +297,7 @@ "afK" = (/obj/structure/table,/obj/structure/bedsheetbin,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/camera{c_tag = "Prison Laundry Room"; dir = 2; network = "Prison"},/obj/machinery/light{dir = 1},/obj/machinery/camera{c_tag = "Prison Laundry Room"; dir = 6; network = "Security"},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/prison) "afL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/wall,/area/prison) "afM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/item/weapon/soap/nanotrasen,/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) -"afN" = (/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) +"afN" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) "afO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/wall/r_wall,/area/prison) "afP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/wall/r_wall,/area/prison) "afQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/prison) @@ -339,7 +339,7 @@ "agA" = (/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) "agB" = (/obj/machinery/door/airlock{name = "Washoom Toilet"; req_access_txt = "0"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) "agC" = (/obj/machinery/light/small{dir = 1},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) -"agD" = (/obj/machinery/disposal/toilet{tag = "icon-toilet (WEST)"; icon_state = "toilet"; dir = 8},/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) +"agD" = (/obj/structure/toilet{tag = "icon-toilet (WEST)"; icon_state = "toilet"; dir = 8},/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/prison) "agE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple{dir = 4},/turf/simulated/wall/r_wall,/area/prison) "agF" = (/obj/machinery/atmospherics/valve{dir = 4},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTHWEST)"; icon_state = "warnplate"; dir = 9},/area/prison) "agG" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor/plating{tag = "icon-warnplate (NORTH)"; icon_state = "warnplate"; dir = 1},/area/prison) @@ -565,7 +565,7 @@ "akS" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor,/area/crew_quarters/courtroom) "akT" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor,/area/crew_quarters/courtroom) "akU" = (/obj/machinery/light,/turf/simulated/floor,/area/crew_quarters/courtroom) -"akV" = (/obj/structure/closet/extinguisher{pixel_x = 5; pixel_y = -32},/turf/simulated/floor,/area/crew_quarters/courtroom) +"akV" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor,/area/crew_quarters/courtroom) "akW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor,/area/crew_quarters/courtroom) "akX" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor,/area/crew_quarters/courtroom) "akY" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/crew_quarters/courtroom) @@ -731,9 +731,9 @@ "aoc" = (/obj/machinery/flasher{dir = 4; id = "permflash"; pixel_x = -24; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/prison) "aod" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "red"; dir = 1},/area/prison) "aoe" = (/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/prison) -"aof" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison) +"aof" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/turf/simulated/floor{icon_state = "red"; dir = 4},/area/prison) "aog" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/security/brig) -"aoh" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/security/brig) +"aoh" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/security/brig) "aoi" = (/obj/structure/stool,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "white"},/area/security/brig) "aoj" = (/turf/simulated/floor{icon_state = "white"},/area/security/brig) "aok" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "Secure Gate"; name = "Security Blast Door"; opacity = 0},/obj/machinery/door/window/brigdoor{tag = "icon-left (EAST)"; name = "Cell 3"; icon_state = "left"; dir = 4; req_access_txt = "1"; id = "Cell 3"},/turf/simulated/floor,/area/security/brig) @@ -757,7 +757,7 @@ "aoC" = (/obj/structure/closet/secure_closet/brig,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{icon_state = "red"; dir = 6},/area/prison) "aoD" = (/obj/structure/table,/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = 6},/obj/machinery/light{dir = 4},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/security/brig) "aoE" = (/obj/machinery/bot/medbot{name = "Mr Fixit"; on = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/security/brig) -"aoF" = (/obj/structure/stool/bed/roller,/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/security/brig) +"aoF" = (/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/security/brig) "aoG" = (/obj/machinery/camera{c_tag = "Medic Station"; dir = 1; network = "Security"},/turf/simulated/floor{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/security/brig) "aoH" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/machinery/camera{c_tag = "Brig South"; dir = 1; network = "Security"},/turf/simulated/floor,/area/security/brig) "aoI" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor{icon_state = "redcorner"; dir = 1},/area/hallway/primary/fore) @@ -891,7 +891,7 @@ "arg" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/alarm{pixel_y = 23},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "arh" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/wall,/area/crew_quarters/fitness) "ari" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness) -"arj" = (/obj/machinery/sink{pixel_y = 29},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness) +"arj" = (/obj/structure/sink{pixel_y = 29},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/fitness) "ark" = (/obj/structure/reagent_dispensers/water_cooler,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/crew_quarters/fitness) "arl" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/item/stack/medical/bruise_pack,/obj/item/stack/medical/ointment{pixel_y = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/crew_quarters/fitness) "arm" = (/obj/machinery/camera{c_tag = "Fitness Room"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/crew_quarters/fitness) @@ -1014,7 +1014,7 @@ "atz" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters) "atA" = (/obj/machinery/light{dir = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters) "atB" = (/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor{icon_state = "neutral"; dir = 1},/area/crew_quarters) -"atC" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters) +"atC" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor{icon_state = "neutral"; dir = 5},/area/crew_quarters) "atD" = (/obj/structure/disposalpipe/segment,/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/crew_quarters/fitness) "atE" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "dark"},/area/crew_quarters/fitness) "atF" = (/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/crew_quarters/fitness) @@ -1042,7 +1042,7 @@ "aub" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint) "auc" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/fore) "aud" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/fore) -"aue" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) +"aue" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) "auf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/maintenance/fsmaint) "aug" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = list("Detective's Office","Law Office")},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "auh" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters) @@ -1257,7 +1257,7 @@ "ayi" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/turf/simulated/floor,/area/ai_monitored/storage/eva) "ayj" = (/obj/machinery/light/small{dir = 8},/obj/structure/closet/secure_closet/personal,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) "ayk" = (/obj/item/weapon/bedsheet,/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"ayl" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"ayl" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aym" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "ayn" = (/obj/structure/table,/obj/item/clothing/under/suit_jacket/really_black,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters) "ayo" = (/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters) @@ -1331,7 +1331,7 @@ "azE" = (/obj/effect/sign/securearea,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/ai_monitored/storage/eva) "azF" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/door/airlock/secure{name = "E.V.A."; req_access_txt = "18"},/obj/structure/cable,/turf/simulated/floor,/area/ai_monitored/storage/eva) "azG" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor{dir = 2; icon_state = "carpet"},/area/crew_quarters) -"azH" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"azH" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "azI" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "azJ" = (/obj/structure/table,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters) "azK" = (/obj/machinery/light,/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/crew_quarters) @@ -1398,7 +1398,7 @@ "aAT" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "bluecorner"},/area/hallway/primary/fore) "aAU" = (/obj/machinery/camera{c_tag = "Dormitory South"; c_tag_order = 999; dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/crew_quarters) "aAV" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/crew_quarters) -"aAW" = (/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aAW" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aAX" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/apc{dir = 4; name = "Dormitory Bathrooms APC"; pixel_x = 26; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aAY" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/toilet) "aAZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -1583,7 +1583,7 @@ "aEw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor{icon_state = "bot"},/area/hallway/secondary/entry) "aEx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "delivery"},/area/hallway/secondary/entry) "aEy" = (/obj/machinery/camera{c_tag = "Security Checkpoint External"; network = "Arrivals"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/secondary/entry) -"aEz" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/secondary/entry) +"aEz" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/hallway/secondary/entry) "aEA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/hallway/secondary/entry) "aEB" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2) "aEC" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plating,/area/maintenance/fpmaint2) @@ -1627,7 +1627,7 @@ "aFo" = (/obj/machinery/vending/cola,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/central) "aFp" = (/turf/simulated/floor{icon_state = "neutral"; dir = 8},/area/hallway/primary/central) "aFq" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/central) -"aFr" = (/obj/machinery/light/small,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/disposal/toilet,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) +"aFr" = (/obj/machinery/light/small,/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/toilet{dir = 1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aFs" = (/obj/machinery/light/small,/obj/machinery/recharge_station,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/toilet) "aFt" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "aFu" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) @@ -1749,7 +1749,7 @@ "aHG" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/hallway/primary/port) "aHH" = (/obj/machinery/light{dir = 1},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/port) "aHI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/port) -"aHJ" = (/obj/structure/closet/extinguisher{pixel_x = 5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/port) +"aHJ" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/port) "aHK" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor,/area/hallway/primary/port) "aHL" = (/obj/machinery/door/firedoor/border_only{dir = 4},/turf/simulated/floor,/area/hallway/primary/port) "aHM" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor,/area/hallway/primary/port) @@ -1757,7 +1757,7 @@ "aHO" = (/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/primary/port) "aHP" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor,/area/hallway/primary/central) "aHQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) -"aHR" = (/obj/machinery/camera{c_tag = "AI Chamber North"; dir = 2},/obj/structure/closet/extinguisher{pixel_x = 5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/central) +"aHR" = (/obj/machinery/camera{c_tag = "AI Chamber North"; dir = 2},/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/central) "aHS" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/hallway/primary/central) "aHT" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/hallway/primary/central) "aHU" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/hallway/primary/central) @@ -1776,7 +1776,7 @@ "aIh" = (/turf/simulated/floor{icon_state = "neutralcorner"; dir = 4},/area/hallway/primary/central) "aIi" = (/turf/simulated/floor{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/central) "aIj" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor{icon_state = "neutralcorner"; dir = 1},/area/hallway/primary/central) -"aIk" = (/obj/machinery/light{dir = 1},/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/central) +"aIk" = (/obj/machinery/light{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/central) "aIl" = (/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor,/area/hallway/primary/central) "aIm" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=EVA2"; location = "Dorm"},/turf/simulated/floor,/area/hallway/primary/central) "aIn" = (/turf/simulated/floor{icon_state = "wood"},/area/library) @@ -1902,7 +1902,7 @@ "aKD" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor{icon_state = "wood"},/area/library) "aKE" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor{icon_state = "wood"},/area/library) "aKF" = (/obj/structure/disposalpipe/sortjunction{sortType = list("Library")},/turf/simulated/wall,/area/library) -"aKG" = (/obj/machinery/power/apc{name = "Hydroponics APC"; dir = 8; pixel_x = -27; pixel_y = 3},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "green"},/area/hydroponics) +"aKG" = (/obj/machinery/power/apc{name = "Hydroponics APC"; dir = 8; pixel_x = -27; pixel_y = 3},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor{icon_state = "green"},/area/hydroponics) "aKH" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "greencorner"; dir = 8},/area/hydroponics) "aKI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor,/area/hydroponics) "aKJ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/turf/simulated/floor{icon_state = "greencorner"; dir = 2},/area/hydroponics) @@ -1922,7 +1922,7 @@ "aKX" = (/obj/structure/stool,/turf/simulated/floor{dir = 8; icon_state = "chapel"},/area/chapel/main) "aKY" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main) "aKZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/stool,/turf/simulated/floor{icon_state = "chapel"},/area/chapel/main) -"aLa" = (/obj/structure/closet/extinguisher{pixel_x = 27},/obj/structure/disposalpipe/trunk,/obj/machinery/disposal,/obj/machinery/light,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) +"aLa" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/structure/disposalpipe/trunk,/obj/machinery/disposal,/obj/machinery/light,/turf/simulated/floor{icon_state = "dark"},/area/chapel/main) "aLb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/wall,/area/chapel/main) "aLc" = (/turf/simulated/wall,/area/hallway/secondary/exit) "aLd" = (/turf/simulated/floor{dir = 9; icon_state = "warning"},/area/hallway/secondary/entry) @@ -1944,7 +1944,7 @@ "aLt" = (/obj/effect/landmark{name = "emcloset"},/turf/simulated/floor,/area/hallway/primary/port) "aLu" = (/obj/structure/table,/turf/simulated/floor,/area/hallway/primary/port) "aLv" = (/obj/machinery/camera{c_tag = "Port Hallway"; dir = 1},/obj/structure/table,/turf/simulated/floor,/area/hallway/primary/port) -"aLw" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = -32},/turf/simulated/floor,/area/hallway/primary/port) +"aLw" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = -32},/turf/simulated/floor,/area/hallway/primary/port) "aLx" = (/turf/simulated/wall/r_wall,/area/hallway/primary/port) "aLy" = (/turf/simulated/wall/r_wall,/area/hallway/primary/central) "aLz" = (/turf/simulated/floor{dir = 4; icon_state = "bluecorner"},/area/hallway/primary/central) @@ -2150,7 +2150,7 @@ "aPr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aPs" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/closet/secure_closet/chemical,/turf/simulated/floor{icon_state = "white"},/area/storage/tools) "aPt" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/storage/tools) -"aPu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/tools) +"aPu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/storage/tools) "aPv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/storage/tools) "aPw" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/hallway/primary/central) "aPx" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central) @@ -2434,7 +2434,7 @@ "aUP" = (/obj/structure/stool/bed/chair,/turf/simulated/floor,/area/security/vacantoffice) "aUQ" = (/obj/machinery/copier,/turf/simulated/floor,/area/security/vacantoffice) "aUR" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating,/area/maintenance/port) -"aUS" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/light/small{dir = 1},/obj/machinery/disposal/toilet{tag = "icon-toilet (EAST)"; icon_state = "toilet"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"aUS" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/light/small{dir = 1},/obj/structure/toilet{tag = "icon-toilet (EAST)"; icon_state = "toilet"; dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aUT" = (/obj/machinery/door/airlock{name = "Unit 1"},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aUU" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aUV" = (/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) @@ -2574,7 +2574,7 @@ "aXz" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/chapel/main) "aXA" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plating,/area/chapel/main) "aXB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/disposalpipe/segment,/turf/simulated/wall,/area/chapel/main) -"aXC" = (/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "escape"},/area/hallway/secondary/exit) +"aXC" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor{dir = 8; icon_state = "escape"},/area/hallway/secondary/exit) "aXD" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aXE" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/secondary/entry) "aXF" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/hallway/secondary/entry) @@ -2583,7 +2583,7 @@ "aXI" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/maintenance/port) "aXJ" = (/obj/machinery/door/airlock{name = "Unit 2"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aXK" = (/obj/structure/disposalpipe/junction,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"aXL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 4},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"aXL" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small{dir = 4},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aXM" = (/obj/machinery/portable_atmospherics/pump,/obj/machinery/camera{c_tag = "Locker Room East"; dir = 4; network = "SS13"},/turf/simulated/floor{icon_state = "delivery"},/area/crew_quarters/locker) "aXN" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/locker) "aXO" = (/obj/machinery/mineral/input,/turf/simulated/floor{tag = "icon-vault (NORTHWEST)"; icon_state = "vault"; dir = 9},/area/mint) @@ -2627,7 +2627,7 @@ "aYA" = (/obj/machinery/power/apc{dir = 1; name = "Starboard Hall APC"; pixel_y = 24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/hallway/primary/starboard) "aYB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/starboard) "aYC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/hallway/primary/starboard) -"aYD" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/starboard) +"aYD" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/starboard) "aYE" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor,/area/hallway/primary/starboard) "aYF" = (/obj/structure/disposalpipe/sortjunction{backsort = 0; dir = 4; icon_state = "pipe-j2s"; sortType = list()},/turf/simulated/floor,/area/hallway/primary/starboard) "aYG" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/light{dir = 1},/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor,/area/hallway/primary/starboard) @@ -2651,7 +2651,7 @@ "aYY" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating,/area/maintenance/port) "aYZ" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/port) "aZa" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"aZb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"aZb" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aZc" = (/obj/machinery/camera{c_tag = "Mint Press"; dir = 4; network = "Command"},/turf/simulated/floor{icon_state = "dark"},/area/mint) "aZd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/mint) "aZe" = (/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/mint) @@ -2697,7 +2697,7 @@ "aZS" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/port) "aZT" = (/obj/machinery/door/airlock{name = "Unit 3"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aZU" = (/obj/structure/disposalpipe/junction,/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"aZV" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"aZV" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "aZW" = (/obj/item/latexballon{name = "Larry"},/turf/simulated/floor/plating,/area/crew_quarters/locker/locker_toilet) "aZX" = (/obj/item/latexballon{name = "Moe"},/turf/simulated/floor/plating,/area/crew_quarters/locker/locker_toilet) "aZY" = (/obj/item/weapon/paper{desc = "Due to spending cutbacks certin organic crewmembers have had to be replaced with synthetic analogs.
    We apologise for any inconvenience caused.

    Nanotrasen Finance Department"; name = "Spending Cutbacks"},/obj/item/latexballon{name = "Curly"},/turf/simulated/floor/plating,/area/crew_quarters/locker/locker_toilet) @@ -2745,7 +2745,7 @@ "baO" = (/turf/simulated/floor{dir = 8; icon_state = "whitecorner"},/area/hallway/primary/starboard) "baP" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass,/turf/simulated/floor,/area/hallway/secondary/exit) "baQ" = (/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/machinery/light,/turf/simulated/floor,/area/hallway/secondary/exit) -"baR" = (/obj/structure/closet/extinguisher{pixel_x = 27},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) +"baR" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/hallway/secondary/exit) "baS" = (/turf/simulated/wall/r_wall,/area/maintenance/disposal) "baT" = (/obj/machinery/conveyor{id = "garbage"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/disposal) "baU" = (/obj/machinery/conveyor{dir = 8; id = "garbage"},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_x = 0; pixel_y = -29},/turf/simulated/floor/plating,/area/maintenance/disposal) @@ -2758,7 +2758,7 @@ "bbb" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/simulated/wall,/area/maintenance/port) "bbc" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/crew_quarters/locker/locker_toilet) "bbd" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) -"bbe" = (/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) +"bbe" = (/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/locker/locker_toilet) "bbf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/maintenance/port) "bbg" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/port) "bbh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/disposalpipe/sortjunction{dir = 8; icon_state = "pipe-j1s"; sortType = list("Locker Room")},/turf/simulated/floor/plating,/area/maintenance/port) @@ -2949,7 +2949,7 @@ "beK" = (/obj/machinery/power/apc{dir = 8; name = "Kitchen APC"; pixel_x = -25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "beL" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "beM" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) -"beN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/sink/kitchen2{pixel_y = 28},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) +"beN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/sink/kitchen{pixel_y = 28},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "beO" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "beP" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "beQ" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = "Streight"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/machinery/door_control{id = "kitchen"; name = "Hallway Shutters"; pixel_x = -1; pixel_y = 24},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) @@ -3196,7 +3196,7 @@ "bjx" = (/obj/structure/rack{dir = 1},/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bjy" = (/obj/effect/landmark{name = "blobstart"},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bjz" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/maintenance/maintcentral) -"bjA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 1},/turf/simulated/floor,/area/hallway/primary/central) +"bjA" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/obj/structure/disposalpipe/segment{dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/turf/simulated/floor,/area/hallway/primary/central) "bjB" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor,/area/hallway/primary/central) "bjC" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/kitchen) "bjD" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 4; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) @@ -3271,7 +3271,7 @@ "bkU" = (/obj/structure/table/reinforced,/obj/item/weapon/reagent_containers/food/snacks/pie,/obj/machinery/door/poddoor/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "kitchen2"; name = "Kitchen Shutters"; opacity = 0},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bkV" = (/obj/structure/table,/obj/item/ashtray/plastic,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bkW" = (/obj/structure/table,/obj/item/clothing/head/cakehat,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) -"bkX" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "Cafeteria North East"; dir = 8; network = "SS13"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) +"bkX" = (/obj/structure/extinguisher_cabinet{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "Cafeteria North East"; dir = 8; network = "SS13"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bkY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plating,/area/maintenance/maintcentral) "bkZ" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/obj/machinery/computer/security/medbay,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bla" = (/obj/effect/landmark/start{name = "Medical Doctor"},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) @@ -3284,7 +3284,7 @@ "blh" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/medical/chemistry) "bli" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/medical/chemistry) "blj" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/closet/wardrobe/chemistry_white,/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry) -"blk" = (/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/copier,/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) +"blk" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/copier,/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bll" = (/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "blm" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/effect/landmark/start{name = "Scientist"},/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) "bln" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{tag = "icon-warnwhite (NORTH)"; icon_state = "warnwhite"; dir = 1},/area/toxins/lab) @@ -3384,7 +3384,7 @@ "bnd" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/central) "bne" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/item/weapon/packageWrap,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/item/weapon/reagent_containers/food/condiment/enzyme,/obj/machinery/camera{c_tag = "Kitchen"; dir = 4; network = "Mess Hall"},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bnf" = (/obj/structure/table,/obj/machinery/blender{pixel_y = 0},/turf/simulated/floor{icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) -"bng" = (/obj/structure/closet/extinguisher{pixel_x = -28; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) +"bng" = (/obj/structure/extinguisher_cabinet{pixel_x = -28; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bnh" = (/mob/living/carbon/monkey{name = "Pun Pun"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bni" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) "bnj" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/cafeteria) @@ -3584,7 +3584,7 @@ "bqV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/simulated/floor/plating,/area/maintenance/asmaint2) "bqW" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/quartermaster/storage) "bqX" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/quartermaster/storage) -"bqY" = (/obj/machinery/camera{c_tag = "Cargo Loading Area South"; dir = 1; network = "Cargo"},/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = -31},/turf/simulated/floor,/area/quartermaster/storage) +"bqY" = (/obj/machinery/camera{c_tag = "Cargo Loading Area South"; dir = 1; network = "Cargo"},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = -31},/turf/simulated/floor,/area/quartermaster/storage) "bqZ" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/obj/machinery/firealarm{dir = 2; pixel_y = -24},/turf/simulated/floor,/area/quartermaster/storage) "bra" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0; tag = "Streight"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/simulated/floor,/area/quartermaster/storage) "brb" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = "90Curve"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = "90Curve"},/turf/simulated/floor,/area/quartermaster/storage) @@ -3629,7 +3629,7 @@ "brO" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/structure/disposalpipe/sortjunction{sortType = list("Diner")},/turf/simulated/wall,/area/maintenance/maintcentral) "brP" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"brR" = (/obj/machinery/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"brR" = (/obj/structure/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "brU" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "Genetics Outer Shutters"; name = "Shutters"; opacity = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) @@ -3739,7 +3739,7 @@ "btU" = (/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor,/area/hallway/primary/aft) "btV" = (/obj/machinery/camera{c_tag = "Aft Primary Hallway 5"; dir = 2},/turf/simulated/floor,/area/hallway/primary/aft) "btW" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor,/area/hallway/primary/aft) -"btX" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/aft) +"btX" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/aft) "btY" = (/obj/machinery/atm{pixel_y = 30},/turf/simulated/floor,/area/hallway/primary/aft) "btZ" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor,/area/hallway/primary/aft) "bua" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor,/area/hallway/primary/aft) @@ -3937,7 +3937,7 @@ "bxK" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bxL" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bxM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bxN" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bxN" = (/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/structure/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bxO" = (/obj/machinery/door_control{dir = 8; id = "Genetics Inner Shutters"; name = "Genetics Inner Shutters"; pixel_x = -22; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bxP" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bxQ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/genetics) @@ -3969,7 +3969,7 @@ "byq" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/structure/closet/secure_closet/qm_personal,/turf/simulated/floor,/area/quartermaster/qm) "byr" = (/obj/structure/table,/obj/item/weapon/pen{pixel_x = 4; pixel_y = 4},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor,/area/quartermaster/qm) "bys" = (/obj/machinery/atmospherics/pipe/manifold{dir = 1},/obj/structure/table,/obj/item/weapon/coin/silver,/obj/item/weapon/coin/silver,/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 1; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor,/area/quartermaster/qm) -"byt" = (/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/quartermaster/miningdock) +"byt" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/floor,/area/quartermaster/miningdock) "byu" = (/turf/simulated/floor,/area/quartermaster/miningdock) "byv" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/quartermaster/miningdock) "byw" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/cable,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/security/nuke_storage) @@ -4011,7 +4011,7 @@ "bzg" = (/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bzh" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/stool/bed/chair,/obj/effect/landmark/start{name = "Geneticist"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bzi" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) -"bzj" = (/obj/structure/closet/extinguisher{pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) +"bzj" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bzk" = (/obj/machinery/atmospherics/trinary/filter{dir = 1; filter_type = 3; icon_state = "intact_off"; locked = 0; name = "High precision gas extractor"; on = 0},/turf/simulated/floor,/area/toxins/toxinslab) "bzl" = (/obj/machinery/atmospherics/portables_connector{dir = 8},/turf/simulated/floor{icon_state = "bot"},/area/toxins/toxinslab) "bzm" = (/obj/machinery/atmospherics/portables_connector{dir = 4; name = "Node 1"},/turf/simulated/floor{icon_state = "bot"},/area/toxins/toxinslab) @@ -4022,7 +4022,7 @@ "bzr" = (/obj/structure/table,/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 8},/obj/item/weapon/pen,/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/simulated/floor{icon_state = "white"},/area/toxins/toxinslab) "bzs" = (/obj/structure/table,/obj/item/device/radio/intercom{pixel_y = 25},/turf/simulated/floor{icon_state = "white"},/area/toxins/toxinslab) "bzt" = (/obj/structure/table,/obj/item/weapon/wrench,/turf/simulated/floor{icon_state = "white"},/area/toxins/toxinslab) -"bzu" = (/obj/structure/closet/extinguisher{pixel_x = -27},/obj/machinery/atmospherics/binary/pump{dir = 1; icon_state = "intact_on"; name = "Gas pump"; on = 1},/turf/simulated/floor,/area/toxins/mixing) +"bzu" = (/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/machinery/atmospherics/binary/pump{dir = 1; icon_state = "intact_on"; name = "Gas pump"; on = 1},/turf/simulated/floor,/area/toxins/mixing) "bzv" = (/obj/machinery/atmospherics/pipe/simple/general/visible,/turf/simulated/floor,/area/toxins/mixing) "bzw" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor{icon_state = "bot"},/area/toxins/mixing) "bzx" = (/obj/machinery/atmospherics/trinary/filter{dir = 2; locked = 0},/turf/simulated/floor,/area/toxins/mixing) @@ -4083,7 +4083,7 @@ "bAA" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Patient Room 2"; req_access_txt = "5"},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAB" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAC" = (/obj/machinery/light,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bAD" = (/obj/machinery/door_control{id = "Patient Room 2 Shutters"; name = "Privacy Shutters"; pixel_y = -25},/obj/machinery/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bAD" = (/obj/machinery/door_control{id = "Patient Room 2 Shutters"; name = "Privacy Shutters"; pixel_y = -25},/obj/structure/sink{icon_state = "sink"; dir = 4; pixel_x = 11; pixel_y = 2},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAE" = (/obj/structure/stool/bed/chair{dir = 8},/obj/machinery/door_control{id = "Patient Room 3 Shutters"; name = "Privacy Shutters"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAF" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bAG" = (/obj/machinery/computer/scan_consolenew,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) @@ -4157,7 +4157,7 @@ "bBW" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall,/area/medical/cryo) "bBX" = (/turf/simulated/wall,/area/medical/cryo) "bBY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bBZ" = (/obj/structure/closet/extinguisher{pixel_x = 27},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bBZ" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bCa" = (/turf/simulated/wall,/area/medical/surgery) "bCb" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/disposalpipe/segment{dir = 1},/obj/item/device/radio/intercom{dir = 8; name = "Station Intercom (General)"; pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bCc" = (/obj/structure/window/reinforced,/turf/simulated/floor,/area/toxins/toxinslab) @@ -4227,7 +4227,7 @@ "bDo" = (/obj/machinery/bodyscanner,/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/medical/surgery) "bDp" = (/obj/machinery/body_scanconsole,/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bDq" = (/obj/machinery/light{dir = 1},/obj/machinery/camera{c_tag = "Sleeper Room"; dir = 2; network = "Medbay"; pixel_x = 22},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) -"bDr" = (/obj/machinery/sink{pixel_y = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) +"bDr" = (/obj/structure/sink{pixel_y = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bDs" = (/obj/structure/table,/obj/item/weapon/storage/stma_kit{pixel_x = 0; pixel_y = 0},/obj/machinery/firealarm{dir = 1; pixel_x = 24; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/surgery) "bDt" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/stamp/rd,/obj/item/ashtray/glass,/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor) "bDu" = (/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/table,/obj/item/device/taperecorder,/obj/machinery/light{dir = 1},/turf/simulated/floor{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/crew_quarters/heads/hor) @@ -4772,7 +4772,7 @@ "bNN" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 8; icon_state = "barber"},/area/medical/cmo) "bNO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/medical/cmo) "bNP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) -"bNQ" = (/obj/structure/closet/extinguisher{pixel_x = 27},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) +"bNQ" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay) "bNR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/medical/surgery) "bNS" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; icon_state = "manifold-r-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery) "bNT" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/medical/surgery) @@ -4876,7 +4876,7 @@ "bPN" = (/obj/machinery/power/apc{dir = 8; name = "Atmospherics APC"; pixel_x = -24},/obj/structure/cable{d1 = 0; d2 = 2; icon_state = "0-2"},/obj/structure/cable,/turf/simulated/floor,/area/atmos) "bPO" = (/obj/machinery/atmospherics/unary/heat_reservoir/heater,/turf/simulated/floor,/area/atmos) "bPP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible,/turf/simulated/wall,/area/atmos) -"bPQ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 5; icon_state = "intact-c"; level = 2},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/atmos) +"bPQ" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 5; icon_state = "intact-c"; level = 2},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/atmos) "bPR" = (/obj/machinery/atmospherics/pipe/simple{color = "cyan"; icon_state = "intact-c"; level = 2},/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; dir = 4; icon_state = "manifold-c"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos) "bPS" = (/obj/machinery/atmospherics/binary/passive_gate,/turf/simulated/floor,/area/atmos) "bPT" = (/obj/machinery/atmospherics/pipe/simple{color = "yellow"; icon_state = "intact-y"; level = 2},/obj/machinery/meter,/turf/simulated/floor,/area/atmos) @@ -5037,14 +5037,14 @@ "bSS" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/sign/biohazard,/turf/simulated/wall/r_wall,/area/medical/virology) "bST" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -23; pixel_y = -8; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bSU" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) -"bSV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"bSV" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bSW" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) "bSX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/research{name = "Research Division"}) "bSY" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/research{name = "Research Division"}) "bSZ" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/medical/research{name = "Research Division"}) "bTa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/turf/simulated/floor,/area/medical/research{name = "Research Division"}) "bTb" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/research{name = "Research Division"}) -"bTc" = (/obj/structure/closet/extinguisher{pixel_x = 27},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/camera{c_tag = "Toxins Auxiliary Storage"; dir = 8; network = "Research"; pixel_x = 0; pixel_y = -22},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/research{name = "Research Division"}) +"bTc" = (/obj/structure/extinguisher_cabinet{pixel_x = 27},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 1},/obj/machinery/camera{c_tag = "Toxins Auxiliary Storage"; dir = 8; network = "Research"; pixel_x = 0; pixel_y = -22},/turf/simulated/floor{dir = 1; icon_state = "warning"},/area/medical/research{name = "Research Division"}) "bTd" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) "bTe" = (/mob/living/carbon/metroid,/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) "bTf" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/toxins/xenobiology) @@ -5077,7 +5077,7 @@ "bTG" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTH" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{autoclose = 0; frequency = 1449; holdopen = 0; icon_state = "door_locked"; id_tag = "virology_airlock_exterior"; locked = 1; name = "Virology Access"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTI" = (/obj/machinery/atmospherics/unary/vent_scrubber,/turf/simulated/floor{icon_state = "white"},/area/medical/virology) -"bTJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"bTJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bTK" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/canister,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/medical/research{name = "Research Division"}) "bTL" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/machinery/light/small,/turf/simulated/floor{dir = 8; icon_state = "warning"},/area/medical/research{name = "Research Division"}) "bTM" = (/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/medical/research{name = "Research Division"}) @@ -5103,7 +5103,7 @@ "bUg" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=1"; freq = 1400; location = "Atmospherics"},/obj/machinery/door/window{base_state = "left"; dir = 2; icon_state = "left"; name = "Atmos Delivery"; req_access_txt = "34"},/turf/simulated/floor{icon_state = "bot"},/area/hallway/primary/aft) "bUh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/atmos) "bUi" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/atmos) -"bUj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact-r (NORTH)"; icon_state = "intact-r"; dir = 1},/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; level = 2},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/atmos) +"bUj" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{tag = "icon-intact-r (NORTH)"; icon_state = "intact-r"; dir = 1},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/portable_atmospherics/pump,/obj/machinery/atmospherics/pipe/simple{color = "cyan"; dir = 4; icon_state = "intact-c"; level = 2},/turf/simulated/floor{dir = 6; icon_state = "warning"},/area/atmos) "bUk" = (/obj/machinery/atmospherics/pipe/manifold{color = "cyan"; dir = 4; icon_state = "manifold-c"; initialize_directions = 11; level = 2},/turf/simulated/floor,/area/atmos) "bUl" = (/obj/machinery/pipedispenser/disposal,/turf/simulated/floor,/area/atmos) "bUm" = (/obj/structure/table,/turf/simulated/floor,/area/atmos) @@ -5126,7 +5126,7 @@ "bUD" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bUE" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/access_button{command = "cycle_exterior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = 23; pixel_y = 8; req_access_txt = "39"},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bUF" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) -"bUG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -8; pixel_y = -19; req_access_txt = "39"},/obj/machinery/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) +"bUG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/access_button{command = "cycle_interior"; master_tag = "virology_airlock_control"; name = "Virology Access Button"; pixel_x = -8; pixel_y = -19; req_access_txt = "39"},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 20},/turf/simulated/floor{icon_state = "white"},/area/medical/virology) "bUH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall/r_wall,/area/medical/virology) "bUI" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/medical/virology) "bUJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/medical/virology) @@ -5147,7 +5147,7 @@ "bUY" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/turf/simulated/floor,/area/hallway/primary/aft) "bUZ" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=AIE"; location = "AftH"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/hallway/primary/aft) "bVa" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "cautioncorner"; dir = 4},/area/hallway/primary/aft) -"bVb" = (/obj/structure/closet/extinguisher{pixel_x = 0; pixel_y = -27},/turf/simulated/floor,/area/hallway/primary/aft) +"bVb" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = -27},/turf/simulated/floor,/area/hallway/primary/aft) "bVc" = (/obj/machinery/light/small,/turf/simulated/floor,/area/hallway/primary/aft) "bVd" = (/turf/simulated/floor{icon_state = "caution"; dir = 4},/area/hallway/primary/aft) "bVe" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "atmos"; name = "Airlock Window Shield"; opacity = 0},/obj/machinery/door/airlock/atmos{name = "Atmospherics"; req_access_txt = "24"},/turf/simulated/floor,/area/atmos) @@ -5408,7 +5408,7 @@ "bZZ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/hallway/primary/aft) "caa" = (/obj/machinery/door/firedoor/border_only,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "yellowcorner"},/area/hallway/primary/aft) "cab" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/wall/r_wall,/area/engine/engineering_break_room) -"cac" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Chief Engineer"); dir = 8; icon_state = "pipe-j2s"; sortType = list("Engineering")},/obj/structure/filingcabinet,/obj/structure/closet/extinguisher{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/engine/engineering_break_room) +"cac" = (/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list("Chief Engineer"); dir = 8; icon_state = "pipe-j2s"; sortType = list("Engineering")},/obj/structure/filingcabinet,/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/turf/simulated/floor,/area/engine/engineering_break_room) "cad" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room) "cae" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/obj/effect/landmark/start{name = "Roboticist"},/obj/structure/disposalpipe/sortjunction{backsort = 1; backType = list(); dir = 8; icon_state = "pipe-j2s"; sortType = list("Engineering")},/turf/simulated/floor,/area/engine/engineering_break_room) "caf" = (/obj/structure/stool/bed/chair/comfy/black{dir = 1},/obj/effect/landmark/start{name = "Station Engineer"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor,/area/engine/engineering_break_room) @@ -5650,7 +5650,7 @@ "ceH" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft) "ceI" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft) "ceJ" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft) -"ceK" = (/obj/structure/closet/extinguisher{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/engine/engineering) +"ceK" = (/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor,/area/engine/engineering) "ceL" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical{pixel_x = -5; pixel_y = -5},/obj/item/weapon/storage/toolbox/electrical{pixel_x = -5; pixel_y = -5},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical{pixel_x = -5; pixel_y = -5},/turf/simulated/floor,/area/engine/engineering) "ceM" = (/obj/machinery/cell_charger,/obj/machinery/camera{c_tag = "SMES Room"; dir = 4; network = "Engineering"},/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/engineering) "ceN" = (/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/module/power_control,/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/item/weapon/cell{charge = 100; maxcharge = 15000},/obj/structure/table/reinforced,/turf/simulated/floor,/area/engine/engineering) @@ -6167,7 +6167,7 @@ "coE" = (/obj/machinery/vending/snack,/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) "coF" = (/obj/machinery/vending/cola,/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) "coG" = (/obj/machinery/computer/arcade,/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) -"coH" = (/obj/structure/closet/extinguisher{pixel_x = 5; pixel_y = 30},/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) +"coH" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = 30},/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) "coI" = (/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/turf/simulated/shuttle/wall{tag = "icon-swall_f5"; icon_state = "swall_f5"; dir = 2},/area/centcom/evac) "coJ" = (/turf/simulated/shuttle/floor,/area/centcom/evac) "coK" = (/obj/structure/table,/obj/item/weapon/storage/firstaid/toxin{pixel_x = -2; pixel_y = 4},/obj/item/weapon/storage/firstaid/toxin,/turf/simulated/shuttle/floor{tag = "icon-floor2"; icon_state = "floor2"},/area/centcom/evac) @@ -7638,7 +7638,7 @@ "cQT" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/djstation) "cQU" = (/obj/structure/window/reinforced{dir = 1},/obj/machinery/space_heater,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/djstation) "cQV" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/rack{dir = 4},/obj/item/clothing/under/soviet,/obj/item/clothing/head/ushanka,/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/djstation) -"cQW" = (/obj/machinery/disposal/toilet{tag = "icon-toilet (WEST)"; icon_state = "toilet"; dir = 8},/obj/structure/disposalpipe/trunk,/turf/unsimulated/floor{icon_state = "white"},/area/djstation) +"cQW" = (/obj/structure/toilet{tag = "icon-toilet (WEST)"; icon_state = "toilet"; dir = 8},/obj/structure/disposalpipe/trunk,/turf/unsimulated/floor{icon_state = "white"},/area/djstation) "cQX" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/weapon/pen,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/djstation) "cQY" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/unsimulated/wall{icon_state = ""; tag = "icon-fwall_opening"},/area/djstation) "cQZ" = (/obj/machinery/door/airlock/external{name = "External Access"; req_access = null; req_access_txt = "0"},/turf/unsimulated/floor,/area/djstation) @@ -8583,8 +8583,8 @@ "djc" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal/deliveryChute{dir = 8},/turf/simulated/floor{icon_state = "floorgrime"},/area/mine/west_outpost) "djd" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/mine/west_outpost) "dje" = (/obj/structure/disposalpipe/sortjunction{backsort = 0; dir = 4; icon_state = "pipe-j1s"; sortType = list("Mining West")},/turf/simulated/floor/airless{tag = "icon-asteroidwarning (WEST)"; icon_state = "asteroidwarning"; dir = 8},/area/mine/explored) -"djf" = (/obj/machinery/disposal/toilet{tag = "icon-toilet (EAST)"; icon_state = "toilet"; dir = 4},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters) -"djg" = (/obj/machinery/sink{pixel_y = 30},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters) +"djf" = (/obj/structure/toilet{tag = "icon-toilet (EAST)"; icon_state = "toilet"; dir = 4},/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters) +"djg" = (/obj/structure/sink{pixel_y = 30},/obj/machinery/light/small,/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters) "djh" = (/obj/machinery/door/airlock{name = "Toilet"},/turf/simulated/floor{icon_state = "showroomfloor"},/area/mine/living_quarters) "dji" = (/obj/machinery/atmospherics/pipe/simple,/turf/simulated/floor,/area/mine/lobby) "djj" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = "Streight"},/turf/simulated/floor,/area/mine/lobby)