diff --git a/code/datums/medical_effects.dm b/code/datums/medical_effects.dm index afbb820dd5e..d6392582ef1 100644 --- a/code/datums/medical_effects.dm +++ b/code/datums/medical_effects.dm @@ -81,7 +81,7 @@ /datum/medical_effect/headache name = "Headache" triggers = list("cryoxadone" = 10) - cures = list("mannitol", "morphine", "acetaminophen", "hydrocodone") + cures = list("mannitol", "morphine", "sal_acid", "hydrocodone") cure_message = "Your head stops throbbing..." /datum/medical_effect/headache/on_life(mob/living/carbon/human/H, strength) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 4d1ae80ccbc..19afa493e1f 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -120,7 +120,7 @@ var/list/uplink_items = list() name = "Chef Excellence's Special Sauce" desc = "A custom made sauce made from the toxin glands of 1000 space carp, if somebody ingests enough they'll be dead in 3 minutes or less guaranteed." item = /obj/item/weapon/reagent_containers/food/condiment/syndisauce - cost = 4 + cost = 2 job = list("Chef") /datum/uplink_item/jobspecific/meatcleaver @@ -130,6 +130,13 @@ var/list/uplink_items = list() cost = 10 job = list("Chef") +/datum/uplink_item/jobspecific/syndidonk + name = "Syndicate Donk Pockets" + desc = "A box of highly specialized donk pockets with a number of regenerative and stimulating chemicals inside of them; the box comes equipped with a self-heating mechanism." + item = /obj/item/weapon/storage/box/syndidonkpockets + cost = 2 + job = list("Chef") + //Janitor /datum/uplink_item/jobspecific/cautionsign @@ -189,7 +196,7 @@ var/list/uplink_items = list() name = "Power Gloves" desc = "Insulated gloves that can utilize the power of the station to deliver a short arc of electricity at a target. Must be standing on a powered cable to use." item = /obj/item/clothing/gloves/color/yellow/power - cost = 14 + cost = 10 job = list("Station Engineer","Chief Engineer") //RD @@ -477,14 +484,6 @@ var/list/uplink_items = list() item = /obj/item/weapon/storage/backpack/satchel_flat cost = 2 -/* Commented out until a balance fix is found -Mel -/datum/uplink_item/stealthy_tools/smdrill - name = "Supermatter Drill" - desc = "A pocket-sized drill tipped with nanoscopic supermatter crystals, able to cut through reinforced walls." - item = /obj/item/weapon/pickaxe/diamonddrill/traitor - cost = 6 -*/ - // DEVICE AND TOOLS /datum/uplink_item/device_tools diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 9cb6a20a3f8..509705d9473 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -485,7 +485,7 @@ REAGENT SCANNER /obj/item/device/slime_scanner name = "slime scanner" - icon_state = "adv_spectrometer" + icon_state = "adv_spectrometer_s" item_state = "analyzer" origin_tech = "biotech=1" w_class = 2.0 diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index d49b8e19b4c..55349e88479 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -74,7 +74,7 @@ effective or pretty fucking useless. /obj/item/device/rad_laser name = "Health Analyzer" - icon_state = "health" + icon_state = "health2" item_state = "healthanalyzer" icon_override = 'icons/mob/in-hand/tools.dmi' desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end." @@ -110,7 +110,7 @@ effective or pretty fucking useless. /obj/item/device/rad_laser/proc/handle_cooldown(var/cooldown) spawn(cooldown) used = 0 - icon_state = "health" + icon_state = "health2" /obj/item/device/rad_laser/attack_self(mob/user as mob) ..() diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 993394a2a75..03f627e56e7 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -125,7 +125,7 @@ /obj/item/weapon/storage/box/injectors name = "\improper DNA injectors" desc = "This box contains injectors it seems." - + New() ..() new /obj/item/weapon/dnainjector/h2m(src) @@ -148,7 +148,7 @@ new /obj/item/ammo_casing/shotgun(src) new /obj/item/ammo_casing/shotgun(src) new /obj/item/ammo_casing/shotgun(src) - new /obj/item/ammo_casing/shotgun(src) + new /obj/item/ammo_casing/shotgun(src) /obj/item/weapon/storage/box/flashbangs name = "box of flashbangs (WARNING)" @@ -355,6 +355,20 @@ new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src) new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src) +/obj/item/weapon/storage/box/syndidonkpockets + name = "box of donk-pockets" + desc = "This box feels slightly warm" + icon_state = "donk_kit" + + New() + ..() + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + new /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket(src) + /obj/item/weapon/storage/box/monkeycubes name = "monkey cube box" desc = "Drymate brand monkey cubes. Just add water!" diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index c56a6480b40..84e92b2efa9 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -10,7 +10,7 @@ icon_state = "brain1" New() - var/datum/reagents/R = new/datum/reagents(1000) + var/datum/reagents/R = new/datum/reagents(330) reagents = R R.my_atom = src ..() diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 59f4fba99d7..a8e33fff58c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -16,7 +16,7 @@ else set_species() - var/datum/reagents/R = new/datum/reagents(1000) + var/datum/reagents/R = new/datum/reagents(330) reagents = R R.my_atom = src diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index aecf82f3a00..7d03ff94d40 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -38,7 +38,7 @@ uni_append = list(0x044,0xC5D) // 044C5D /mob/living/carbon/monkey/New() - var/datum/reagents/R = new/datum/reagents(1000) + var/datum/reagents/R = new/datum/reagents(330) reagents = R R.my_atom = src diff --git a/code/modules/mob/living/simple_animal/borer.dm b/code/modules/mob/living/simple_animal/borer.dm index 6a1916c25f5..78a61f173af 100644 --- a/code/modules/mob/living/simple_animal/borer.dm +++ b/code/modules/mob/living/simple_animal/borer.dm @@ -259,7 +259,7 @@ if(chemicals < 50) src << "You don't have enough chemicals!" - var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","acetaminophen") + var/chem = input("Select a chemical to secrete.", "Chemicals") as null|anything in list("mannitol","styptic_powder","methamphetamine","sal_acid") if(!chem || chemicals < 50 || !host || controlling || !src || stat) //Sanity check. return diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm index dc63c0ab4b4..7216e0a519c 100644 --- a/code/modules/organs/blood.dm +++ b/code/modules/organs/blood.dm @@ -74,6 +74,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if (reagents.has_reagent("iron")) //Hematogen candy anyone? B.volume += 0.8 reagents.remove_reagent("iron", 0.1) + if (reagents.has_reagent("salglu_solution")) //saline is good for blood regeneration + if(prob(33)) + B.volume += 1.0 // Damaged heart virtually reduces the blood volume, as the blood isn't // being pumped properly anymore. diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index f606f7b7838..831a7184084 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -9,7 +9,7 @@ mob/var/next_pain_time = 0 // amount is a num from 1 to 100 mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0) if(stat >= 2) return - if(reagents.has_reagent("acetaminophen")) + if(reagents.has_reagent("sal_acid")) return if(reagents.has_reagent("morphine")) return diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 1c925655bea..b6313d6eae4 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -159,6 +159,13 @@ /obj/item/ammo_casing/shotgun/dart/attackby() return +/obj/item/ammo_casing/shotgun/tranquilizer + name = "tranquilizer darts" + desc = "A tranquilizer round used to subdue individuals utilizing stimulants." + icon_state = "cshell" + projectile_type = "/obj/item/projectile/bullet/dart/syringe/tranquilizer" + m_amt = 250 + /obj/item/ammo_casing/syringegun name = "syringe gun spring" desc = "A high-power spring that throws syringes." diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index bd0e398723f..36bb1207542 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -68,4 +68,10 @@ /obj/item/ammo_box/shotgun/beanbag name = "Ammunition Box (beanbag shells)" ammo_type = /obj/item/ammo_casing/shotgun/beanbag - m_amt = 4000 \ No newline at end of file + m_amt = 4000 + +/obj/item/ammo_box/shotgun/tranquilizer + name = "Ammunition Box (tranquilizer darts)" + icon_state = "45box" + ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer + m_amt = 2000 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 1655470302b..94be3133b84 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -182,6 +182,11 @@ icon = 'icons/obj/chemical.dmi' icon_state = "syringeproj" +/obj/item/projectile/bullet/dart/syringe/tranquilizer + New() + ..() + reagents.add_reagent("haloperidol", 15) + /obj/item/projectile/bullet/neurotoxin name = "neurotoxin spit" icon_state = "neurotoxin" diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index e704ce70950..abe1d517e4a 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -25,7 +25,7 @@ var/unhack_message = "You re-enable the safety safeguards, enabling the \"NT Standard\" mode." var/list/broken_requirements = list() var/broken_on_spawn = 0 - var/recharge_delay = 15 + var/recharge_delay = 5 var/image/icon_beaker = null //cached overlay diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 1588cbb14f7..79204a72986 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -858,20 +858,6 @@ datum ..() return - acetaminophen - name = "Acetaminophenl" - id = "acetaminophen" - description = "Most probably know this as Tylenol. This chemical is a mild, simple painkiller." - reagent_state = LIQUID - color = "#C855DC" - shock_reduction = 40 - metabolization_rate = 0.2 // Lasts 2.5 minutes for 15 units - - on_mob_life(var/mob/living/M as mob) // what the fuck are you idiots smoking - if(!M) M = holder.my_atom - ..() - return - mutagen name = "Unstable mutagen" id = "mutagen" @@ -901,7 +887,7 @@ datum return hydrocodone - name = "Hydrocodone-Acetaminophen" + name = "Hydrocodone" id = "hydrocodone" description = "An extremely effective painkiller; may have long term abuse consequences." reagent_state = LIQUID @@ -1246,9 +1232,9 @@ datum ..() return - inacusiate - name = "Inacusiate" - id = "inacusiate" + audioline + name = "Audioline" + id = "audioline" description = "Heals ear damage." reagent_state = LIQUID color = "#6600FF" // rgb: 100, 165, 255 @@ -1260,10 +1246,10 @@ datum ..() return - peridaxon - name = "Peridaxon" - id = "peridaxon" - description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." + mitocholide + name = "Mitocholide" + id = "mitocholide" + description = "A specialized drugs that stimulates the mitochondria of cells to encourage healing of internal organs." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 @@ -1292,7 +1278,7 @@ datum if(M.bodytemperature < 170) M.adjustCloneLoss(-1) M.adjustOxyLoss(-10) - M.heal_organ_damage(3,3) + M.heal_organ_damage(12,12) M.adjustToxLoss(-3) ..() return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 6d34c808ab5..2efe1bfc763 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -75,20 +75,12 @@ datum result_amount = 3 mix_message = "The substance turns neon green and bubbles unnervingly." - acetaminophen - name = "Acetaminophen" - id = "acetaminophen" - result = "acetaminophen" - required_reagents = list("phenol" = 1, "sodium" = 1, "oxygen" = 1, "nitrogen" = 1, "sacid" = 1, "water" = 1) - result_amount = 6 - mix_message = "The mixture becomes a fine white powder." - hydrocodone name = "Hydrocodone" id = "hydrocodone" result = "hydrocodone" - required_reagents = list("morphine" = 1, "acetaminophen" = 1, "sacid" = 1, "water" = 1, "oil" = 1) - result_amount = 3 + required_reagents = list("morphine" = 1, "sacid" = 1, "water" = 1, "oil" = 1) + result_amount = 2 thermite name = "Thermite" @@ -112,12 +104,11 @@ datum required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1) result_amount = 4 - peridaxon - name = "Peridaxon" - id = "peridaxon" - result = "peridaxon" - required_reagents = list("styptic_powder" = 2, "clonexadone" = 2) - required_catalysts = list("plasma" = 5) + mitocholide + name = "mitocholide" + id = "mitocholide" + result = "mitocholide" + required_reagents = list("synthflesh" = 1, "clonexadone" = 1) result_amount = 2 holy_water @@ -127,13 +118,6 @@ datum required_reagents = list("water" = 1, "mercury" = 1, "wine" = 1) result_amount = 3 - virus_food - name = "Virus Food" - id = "virusfood" - result = "virusfood" - required_reagents = list("water" = 1, "milk" = 1) - result_amount = 5 - cryptobiolin name = "Cryptobiolin" id = "cryptobiolin" @@ -164,12 +148,12 @@ datum required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1) result_amount = 2 - inacusiate - name = "inacusiate" - id = "inacusiate" - result = "inacusiate" - required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1) - result_amount = 2 + Audioline + name = "Audioline" + id = "audioline" + result = "audioline" + required_reagents = list("spaceacillin" = 1, "salglu_solution" = 1, "epinephrine" = 1) + result_amount = 3 glycerol name = "Glycerol" @@ -230,8 +214,8 @@ datum name = "Virus Food" id = "virusfood" result = "virusfood" - required_reagents = list("water" = 5, "milk" = 5, "oxygen" = 5) - result_amount = 15 + required_reagents = list("water" = 1, "milk" = 1, "oxygen" = 1) + result_amount = 3 /* mix_virus name = "Mix Virus" diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm index 6368ccce6c9..727d0b2a822 100644 --- a/code/modules/reagents/newchem/chem_heater.dm +++ b/code/modules/reagents/newchem/chem_heater.dm @@ -8,7 +8,7 @@ idle_power_usage = 40 var/obj/item/weapon/reagent_containers/beaker = null var/temperature = 300 - var/rate = 10 //heating/cooling rate, default is 10 kelvin per tick + var/rate = 15 //heating/cooling rate, default is 10 kelvin per tick var/on = FALSE diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index c730e4a0469..43becc47022 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -264,6 +264,7 @@ datum/reagent/sal_acid description = "This is a is a standard salicylate pain reliever and fever reducer." reagent_state = LIQUID color = "#C8A5DC" + shock_reduction = 40 overdose_threshold = 25 datum/reagent/sal_acid/on_mob_life(var/mob/living/M as mob) diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index e27b9647491..83f0cf6bf8b 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -21,7 +21,7 @@ reagent_ids = list("styptic_powder", "epinephrine", "salbutamol") /obj/item/weapon/reagent_containers/borghypo/crisis - reagent_ids = list("salglu_solution", "epinephrine", "acetaminophen") + reagent_ids = list("salglu_solution", "epinephrine", "sal_acid") /obj/item/weapon/reagent_containers/borghypo/New() ..() diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 5b7383f04d6..ab0f11b9166 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -157,12 +157,12 @@ /obj/item/weapon/reagent_containers/food/condiment/syndisauce name = "Chef Excellence's Special Sauce" - desc = "A potent sauce distilled from the toxin glands of 1000 Space Carp with an extra touch of LSD because why not?" - amount_per_transfer_from_this = 1 - volume = 20 + desc = "A potent sauce extracted from the potent amanita mushrooms. Death never tasted quite so delicious." + amount_per_transfer_from_this = 5 + volume = 50 New() ..() - reagents.add_reagent("chefspecial", 20) + reagents.add_reagent("amanitin", 50) //Food packs. To easily apply deadly toxi... delicious sauces to your food! /obj/item/weapon/reagent_containers/food/condiment/pack diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index b0049ffb723..dd0a00714b8 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -794,6 +794,23 @@ src.name = "donk-pocket" return +/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket + name = "Donk-pocket" + desc = "This donk-pocket is emitting a small amount of heat." + icon_state = "donkpocket" + filling_color = "#DEDEAB" + volume = 90 + bitesize = 100 //nom the whole thing at once. + + New() + ..() + reagents.add_reagent("omnizine", 15) + reagents.add_reagent("teporone", 15) + reagents.add_reagent("synaptizine", 15) + reagents.add_reagent("salglu_solution", 15) + reagents.add_reagent("salbutamol", 15) + reagents.add_reagent("methamphetamine", 15) + /obj/item/weapon/reagent_containers/food/snacks/brainburger name = "brainburger" desc = "A strange looking burger. It looks almost sentient." diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 7083019f866..c948daa4bc7 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -242,4 +242,12 @@ icon_state = "rbottle6" New() ..() - reagents.add_reagent("sacid", 50) \ No newline at end of file + reagents.add_reagent("sacid", 50) + +/obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde + name = "Formaldehyde Bottle" + desc = "A reagent bottle. Contains formaldehyde." + icon_state = "rbottle" + New() + ..() + reagents.add_reagent("formaldehyde", 50) \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm index b345844d57d..997993898cb 100644 --- a/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm +++ b/code/modules/research/xenoarchaeology/genetics/prehistoric_plants.dm @@ -62,7 +62,7 @@ icon_state = "valeleaves" New(var/loc, var/potency) ..() - reagents.add_reagent("acetaminophen", potency * 5) + reagents.add_reagent("sal_acid", potency * 5) reagents.add_reagent("salbutamol", potency * 2) reagents.add_reagent("nutriment", potency) bitesize = 1+round(reagents.total_volume / 2, 1) diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 3d6f75126e6..af089164950 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/maps/cyberiad.dmm b/maps/cyberiad.dmm index f1da677831a..73deff7043c 100644 --- a/maps/cyberiad.dmm +++ b/maps/cyberiad.dmm @@ -136,7 +136,7 @@ "acF" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/medical/research{name = "Research Division"}) "acG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/security/permabrig) "acH" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/gun/projectile/shotgun/riot,/obj/machinery/ai_status_display{pixel_x = 0; pixel_y = 32},/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) -"acI" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/window/reinforced{dir = 1},/obj/structure/rack,/obj/item/ammo_box/shotgun/beanbag,/obj/item/ammo_box/shotgun/beanbag,/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) +"acI" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/window/reinforced{dir = 1},/obj/structure/rack,/obj/item/ammo_box/shotgun/beanbag{pixel_x = -3; pixel_y = 3},/obj/item/ammo_box/shotgun/beanbag,/obj/item/ammo_box/shotgun/tranquilizer{pixel_x = 3; pixel_y = -3},/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) "acJ" = (/obj/structure/rack,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/item/weapon/gun/projectile/shotgun/riot,/turf/simulated/floor{dir = 8; icon_state = "vault"; tag = "icon-vault (WEST)"},/area/security/securearmoury) "acK" = (/obj/machinery/light_switch{pixel_x = -25},/turf/simulated/floor{icon_state = "dark"},/area/security/hos) "acL" = (/turf/simulated/floor{icon_state = "dark"},/area/security/hos) @@ -2167,7 +2167,7 @@ "aPI" = (/obj/machinery/hologram/holopad,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office) "aPJ" = (/obj/structure/closet/coffin,/obj/machinery/door/window/eastleft{dir = 8; name = "Coffin Storage"; req_access_txt = "22"},/turf/simulated/floor{icon_state = "dark"},/area/chapel/office) "aPK" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor{dir = 1; icon_state = "chapel"},/area/chapel/main) -"aPL" = (/obj/structure/table,/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main) +"aPL" = (/obj/structure/table,/obj/item/weapon/storage/bible,/turf/simulated/floor{dir = 4; icon_state = "chapel"},/area/chapel/main) "aPM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor,/area/escapepodbay) "aPN" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/shuttle/arrival/station) "aPO" = (/turf/simulated/shuttle/wall{icon_state = "swall13"; dir = 2},/area/shuttle/arrival/station) @@ -3533,7 +3533,7 @@ "bpW" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/stool/bed/chair/wheelchair,/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) "bpX" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/stool,/obj/machinery/camera{c_tag = "Medbay Examination Room"; network = list("SS13")},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) "bpY" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/light{dir = 1},/turf/simulated/floor{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/exam_room) -"bpZ" = (/obj/structure/table,/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = -2},/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/medical/morgue) +"bpZ" = (/obj/structure/table,/obj/item/device/camera{name = "Autopsy Camera"; pixel_x = -2; pixel_y = -2},/obj/item/clothing/gloves/color/latex,/obj/item/weapon/reagent_containers/glass/bottle/reagent/formaldehyde,/obj/item/weapon/reagent_containers/syringe,/turf/simulated/floor{dir = 9; icon_state = "blue"},/area/medical/morgue) "bqa" = (/obj/structure/disposalpipe/trunk{dir = 4},/obj/machinery/disposal,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/morgue) "bqb" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/morgue) "bqc" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/medical/morgue) @@ -8218,7 +8218,7 @@ "dcb" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows (EAST)"; icon_state = "fakewindows"; dir = 4},/area/syndicate_mothership) "dcc" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/obj/structure/flora/grass/both,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) "dcd" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/obj/structure/flora/tree/pine,/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"},/area/syndicate_mothership) -"dce" = (/obj/structure/table,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 3},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) +"dce" = (/obj/structure/table,/obj/item/weapon/storage/box/syndidonkpockets,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "dcf" = (/obj/structure/stool/bed/chair/comfy/black{tag = "icon-comfychair_black (NORTH)"; icon_state = "comfychair_black"; dir = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/syndicate_station/start) "dcg" = (/turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"},/turf/unsimulated/floor{tag = "icon-gravsnow_corner (EAST)"; icon = 'icons/turf/snow.dmi'; icon_state = "gravsnow_corner"; dir = 4},/area/syndicate_mothership) "dch" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership)