diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index 8254b0caa87..f61180599d2 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -1000,7 +1000,7 @@ "tl" = (/obj/structure/table,/obj/machinery/door/window/southleft{layer = 3.1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "tm" = (/obj/structure/table,/obj/machinery/door/window/southright{layer = 3.1},/turf/simulated/floor/plasteel,/area/hallway/primary/central) "tn" = (/obj/structure/table/reinforced,/obj/machinery/door/window/eastright{dir = 2; name = "Chemistry Desk"; req_access_txt = "33"},/obj/item/clothing/glasses/science,/turf/simulated/floor/plating,/area/medical/medbay) -"to" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"to" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 2; on = 1},/obj/structure/table,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/syringes,/obj/item/weapon/storage/pill_bottle/ephedrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/ephedrine{pixel_x = 5; pixel_y = -2},/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "tp" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 2; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/stack/packageWrap,/obj/item/weapon/hand_labeler,/obj/item/device/radio/headset/headset_med,/obj/item/device/radio/intercom{broadcasting = 0; freerange = 0; listening = 1; name = "Common Channel"; pixel_y = 25},/obj/machinery/camera/autoname,/turf/simulated/floor/plasteel{tag = "icon-whiteyellowcorner"; icon_state = "whiteyellowcorner"; dir = 2},/area/medical/medbay) "tq" = (/obj/machinery/smartfridge/chemistry,/turf/simulated/wall,/area/medical/medbay) "tr" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{tag = "icon-whiteyellowcorner (WEST)"; icon_state = "whiteyellowcorner"; dir = 8},/area/medical/medbay) @@ -1246,7 +1246,7 @@ "xX" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/machinery/light/small,/obj/machinery/processor,/turf/simulated/floor/wood,/area/crew_quarters/bar) "xY" = (/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/wood,/area/crew_quarters/bar) "xZ" = (/obj/structure/table,/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/belt/medical{pixel_x = 0; pixel_y = 2},/obj/item/weapon/storage/firstaid/regular{pixel_x = 2; pixel_y = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = -2; pixel_y = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) -"ya" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) +"ya" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/ephedrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/charcoal{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/ephedrine{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/ephedrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "yb" = (/obj/structure/table,/obj/machinery/light,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/tie/stethoscope,/obj/item/weapon/reagent_containers/hypospray,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "yc" = (/obj/docking_port/stationary{dheight = 9; dir = 2; dwidth = 5; height = 22; id = "syndicate_se"; name = "southeast of station"; turf_type = /turf/unsimulated/floor{icon = 'icons/turf/snow.dmi'; icon_state = "snow"}; width = 18},/turf/space,/area/space) "yd" = (/obj/structure/rack,/obj/item/clothing/mask/gas,/obj/item/clothing/glasses/sunglasses,/turf/simulated/floor/plating,/area/hallway/primary/central) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 12e465383f8..920e5c3ec4f 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -271,7 +271,7 @@ "afk" = (/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) "afl" = (/obj/machinery/flasher_button{id = "insaneflash"; pixel_y = -26},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) "afm" = (/obj/structure/table,/obj/item/device/electropack,/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) -"afn" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/razor{pixel_x = -6},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) +"afn" = (/obj/structure/table,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/item/weapon/razor{pixel_x = -6},/obj/item/stack/medical/ointment{pixel_y = 4},/obj/item/stack/medical/bruise_pack{pixel_x = 10; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/ephedrine{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "whitehall"; dir = 2},/area/security/prison) "afo" = (/obj/structure/table,/obj/item/device/assembly/signaler,/turf/simulated/floor/plasteel{dir = 2; icon_state = "escape"},/area/security/prison) "afp" = (/obj/structure/closet/secure_closet/brig{anchored = 1},/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/prison) "afq" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_security{name = "Prison Wing"; req_access_txt = "2"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 9},/area/security/prison) @@ -3069,7 +3069,7 @@ "bha" = (/obj/item/device/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Command)"; pixel_x = -28},/obj/machinery/suit_storage_unit/captain,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bhb" = (/obj/machinery/computer/card,/obj/item/weapon/card/id/captains_spare,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/wood,/area/crew_quarters/captain) "bhc" = (/obj/structure/table/wood,/obj/machinery/recharger,/obj/item/weapon/melee/chainofcommand,/turf/simulated/floor/wood,/area/crew_quarters/captain) -"bhd" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline,/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/requests_console{department = "Chemistry"; departmentType = 2; pixel_x = -30; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) +"bhd" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/glass/bottle/ephedrine,/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/item/stack/sheet/mineral/plasma{layer = 2.9},/obj/machinery/requests_console{department = "Chemistry"; departmentType = 2; pixel_x = -30; pixel_y = 0},/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bhe" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bhf" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "bhg" = (/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) @@ -3150,7 +3150,7 @@ "biD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "biE" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/obj/machinery/chem_heater,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) "biF" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/chemistry) -"biG" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/obj/item/weapon/storage/pill_bottle/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellow"},/area/medical/chemistry) +"biG" = (/obj/structure/table/glass,/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/storage/box/beakers{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/glass/beaker/large,/obj/item/weapon/reagent_containers/dropper,/obj/item/weapon/reagent_containers/dropper,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteyellow"},/area/medical/chemistry) "biH" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/medical/chemistry) "biI" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "biJ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitebluecorner"},/area/medical/medbay) @@ -4341,7 +4341,7 @@ "bFy" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/structure/sign/nosmoking_2{pixel_x = -28},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitebluecorner"},/area/medical/sleeper) "bFz" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/medical,/obj/machinery/vending/wallmed1{pixel_x = 28; pixel_y = 0},/obj/machinery/camera{c_tag = "Medbay Recovery Room"; dir = 8; network = list("SS13")},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bFA" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/weapon/folder/white,/obj/item/weapon/hand_labeler,/obj/item/weapon/gun/syringe,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) -"bFB" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = -4; pixel_y = -3},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 3; pixel_y = -2},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = 5; pixel_y = -2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) +"bFB" = (/obj/structure/table,/obj/item/weapon/reagent_containers/glass/bottle/ephedrine{pixel_x = 7; pixel_y = -3},/obj/item/weapon/reagent_containers/glass/bottle/stoxin,/obj/item/weapon/reagent_containers/glass/bottle/toxin{pixel_x = 4; pixel_y = 2},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bFC" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/sleeper) "bFD" = (/obj/structure/table,/obj/item/weapon/folder/white,/obj/item/clothing/tie/stethoscope,/obj/machinery/vending/wallmed1{pixel_y = 28},/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) "bFE" = (/obj/structure/stool/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/medbay) @@ -5716,7 +5716,7 @@ "cfV" = (/obj/machinery/power/apc{cell_type = 15000; dir = 1; name = "Engineering APC"; pixel_x = 0; pixel_y = 25},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cfW" = (/obj/machinery/light{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cfX" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) -"cfY" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/reagent_containers/pill/antitox,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) +"cfY" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cfZ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/mask/breath{step_x = 0; step_y = 0},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cga" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cgb" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) @@ -5775,7 +5775,7 @@ "chc" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/camera{c_tag = "Chief Engineer's Office"; dir = 4; network = list("SS13")},/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/mob/living/simple_animal/parrot/Poly,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chd" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "che" = (/obj/structure/table/reinforced,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/storage/fancy/cigarettes,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) -"chf" = (/obj/structure/table/reinforced,/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/reagent_containers/pill/kelotane{pixel_x = -3; pixel_y = -8},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) +"chf" = (/obj/structure/table/reinforced,/obj/item/stack/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/obj/item/weapon/stock_parts/cell/high{charge = 100; maxcharge = 15000},/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 27},/turf/simulated/floor/plasteel{dir = 2; icon_state = "neutralfull"},/area/engine/chiefs_office) "chg" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "chh" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) "chi" = (/obj/machinery/door/poddoor/preopen{id = "Engineering"; name = "engineering security door"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"; name = "floor"},/area/engine/engineering) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index f61acbb4470..60f50050301 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -12,7 +12,7 @@ var/list/archive_diseases = list() // The order goes from easy to cure to hard to cure. var/list/advance_cures = list( "nutriment", "sugar", "orangejuice", - "spaceacillin", "kelotane", "ethanol", + "spaceacillin", "salglu_solution", "ethanol", "leporazine", "synaptizine", "lipozine", "silver", "gold" ) diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index cb7a02109ef..b82bdfbc9a1 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -10,7 +10,7 @@ Self-Respiration Fatal Level. Bonus - The body generates Dexalin Plus. + The body generates salbutamol Plus. ////////////////////////////////////// */ @@ -30,8 +30,8 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(4, 5) - if (M.reagents.get_reagent_amount("dexalinp") < 20) - M.reagents.add_reagent("dexalinp", 20) + if (M.reagents.get_reagent_amount("salbutamol") < 20) + M.reagents.add_reagent("salbutamol", 20) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) M << "[pick("Your lungs feel great.", "You are now breathing manually.", "You don't feel the need to breathe.")]" diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 59b1e4ae1f0..aeb76b340c4 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -10,7 +10,7 @@ Stimulant Moderate Level. Bonus - The body generates Hyperzine. + The body generates morphine. ////////////////////////////////////// */ @@ -30,8 +30,8 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(5) - if (M.reagents.get_reagent_amount("hyperzine") < 30) - M.reagents.add_reagent("hyperzine", 10) + if (M.reagents.get_reagent_amount("morphine") < 30) + M.reagents.add_reagent("morphine", 10) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) M << "[pick("You feel restless.", "You feel like running laps around the station.")]" diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d5f47e7827e..909855260d3 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -523,10 +523,10 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical/supplies name = "Medical Supplies Crate" - contains = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin, - /obj/item/weapon/reagent_containers/glass/bottle/antitoxin, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline, + contains = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal, + /obj/item/weapon/reagent_containers/glass/bottle/charcoal, + /obj/item/weapon/reagent_containers/glass/bottle/ephedrine, + /obj/item/weapon/reagent_containers/glass/bottle/ephedrine, /obj/item/weapon/reagent_containers/glass/bottle/stoxin, /obj/item/weapon/reagent_containers/glass/bottle/stoxin, /obj/item/weapon/reagent_containers/glass/bottle/morphine, diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index 50f2dcd8336..e0870964a61 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -124,7 +124,7 @@ proc/make_mining_asteroid_secret() treasureitems = list(/obj/item/weapon/gun/energy/floragun=1,/obj/item/seeds/novaflowerseed=2,/obj/item/seeds/bluespacetomatoseed=2,/obj/item/seeds/bluetomatoseed=2, /obj/item/seeds/coffee_robusta_seed=2, /obj/item/seeds/cashseed=2) fluffitems = list(/obj/structure/flora/kirbyplants=1,/obj/structure/table/reinforced=2,/obj/machinery/hydroponics=1, - /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/antitoxin=2, + /obj/effect/glowshroom/single=2,/obj/item/weapon/reagent_containers/syringe/charcoal=2, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,/obj/item/weapon/reagent_containers/glass/bottle/ammonia=3) /*if("poly") diff --git a/code/game/dna.dm b/code/game/dna.dm index e43a55fe024..eaaed4ea646 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -543,7 +543,7 @@ occupant_status += "" occupant_status += "
Health:
[viable_occupant.health]%
" occupant_status += "
Radiation Level:
[viable_occupant.radiation]%
" - var/rejuvenators = viable_occupant.reagents.get_reagent_amount("inaprovaline") + var/rejuvenators = viable_occupant.reagents.get_reagent_amount("ephedrine") occupant_status += "
Rejuvenators:
[rejuvenators] units
" occupant_status += "
Unique Enzymes :
[viable_occupant.dna.unique_enzymes]
" occupant_status += "
Last Operation:
[last_change ? last_change : "----"]
" @@ -752,9 +752,9 @@ current_screen = href_list["text"] if("rejuv") if(viable_occupant && viable_occupant.reagents) - var/inaprovaline_amount = viable_occupant.reagents.get_reagent_amount("inaprovaline") - var/can_add = max(min(REJUVENATORS_MAX - inaprovaline_amount, REJUVENATORS_INJECT), 0) - viable_occupant.reagents.add_reagent("inaprovaline", can_add) + var/ephedrine_amount = viable_occupant.reagents.get_reagent_amount("ephedrine") + var/can_add = max(min(REJUVENATORS_MAX - ephedrine_amount, REJUVENATORS_INJECT), 0) + viable_occupant.reagents.add_reagent("ephedrine", can_add) if("setbufferlabel") var/text = sanitize(input(usr, "Input a new label:", "Input an Text", null) as text|null) if(num && text) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index a02321d79b1..60bc0a7bacc 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -268,7 +268,7 @@ /obj/item/clothing/suit/space/changeling/process() if(ishuman(loc)) var/mob/living/carbon/human/H = loc - H.reagents.add_reagent("dexalinp", REAGENTS_METABOLISM) + H.reagents.add_reagent("salbutamol", REAGENTS_METABOLISM) /obj/item/clothing/head/helmet/space/changeling name = "flesh mass" diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index 35067080403..e69d8f861a1 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -11,8 +11,8 @@ user << "We cleanse impurities from our form." user.reagents.add_reagent("ryetalyn", 10) - user.reagents.add_reagent("hyronalin", 10) - user.reagents.add_reagent("anti_toxin", 20) + user.reagents.add_reagent("potass_iodide", 10) + user.reagents.add_reagent("charcoal", 20) for(var/datum/disease/D in user.viruses) D.cure() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 181536d3b6f..8fb1554f02b 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -15,10 +15,10 @@ var/efficiency var/initial_bin_rating = 1 var/min_health = 25 - var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible - var/list/possible_chems = list(list("stoxin", "dexalin", "bicaridine", "kelotane"), - list("stoxin", "dexalinp", "bicaridine", "dermaline", "imidazoline"), - list("stoxin", "dexalinp", "bicaridine", "dermaline", "imidazoline", "anti_toxin", "ryetalyn", "alkysine", "arithrazine")) + var/list/injection_chems = list() //list of injectable chems except ephedrine, coz ephedrine is always avalible + var/list/possible_chems = list(list("stoxin", "salbutamol", "salglu_solution", "salglu_solution"), + list("stoxin", "salbutamol", "salglu_solution", "salglu_solution", "oculine"), + list("stoxin", "salbutamol", "salglu_solution", "salglu_solution", "oculine", "charcoal", "ryetalyn", "alkysine", "pen_acid")) /obj/machinery/sleeper/New() ..() @@ -126,9 +126,9 @@ var/dat dat += "

Injector

" if(occupant) - dat += "Inject Inaprovaline" + dat += "Inject ephedrine" else - dat += "Inject Inaprovaline" + dat += "Inject ephedrine" if(occupant && occupant.health > min_health) for(var/re in injection_chems) var/datum/reagent/C = chemical_reagents_list[re] @@ -191,7 +191,7 @@ close_machine() return if(occupant && occupant.stat != DEAD) - if(href_list["inject"] == "inaprovaline" || occupant.health > min_health) + if(href_list["inject"] == "ephedrine" || occupant.health > min_health) inject_chem(usr, href_list["inject"]) else usr << "ERROR: Subject is not in stable condition for auto-injection." @@ -218,7 +218,7 @@ if(!is_operational()) return if(occupant && occupant.reagents) - if(chem in injection_chems + "inaprovaline") + if(chem in injection_chems + "ephedrine") if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) occupant.reagents.add_reagent(chem, 10) var/units = round(occupant.reagents.get_reagent_amount(chem)) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index f2472b632d2..60608862b16 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -32,10 +32,10 @@ var/stationary_mode = 0 //If enabled, the Medibot will not move automatically. radio_frequency = MED_FREQ //Medical frequency //Setting which reagents to use to treat what by default. By id. - var/treatment_brute = "tricordrazine" - var/treatment_oxy = "tricordrazine" - var/treatment_fire = "tricordrazine" - var/treatment_tox = "tricordrazine" + var/treatment_brute = "salglu_solution" + var/treatment_oxy = "salbutamol" + var/treatment_fire = "salglu_solution" + var/treatment_tox = "charcoal" var/treatment_virus = "spaceacillin" var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible. var/shut_up = 0 //self explanatory :) @@ -46,10 +46,10 @@ name = "\improper Mysterious Medibot" desc = "International Medibot of mystery." skin = "bezerk" - treatment_oxy = "dexalinp" - treatment_brute = "bicaridine" - treatment_fire = "kelotane" - treatment_tox = "anti_toxin" + treatment_oxy = "salbutamol" + treatment_brute = "salglu_solution" + treatment_fire = "salglu_solution" + treatment_tox = "charcoal" /obj/item/weapon/firstaid_arm_assembly name = "incomplete medibot assembly." diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 5d68e0878bf..36ced62bd5e 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -218,8 +218,8 @@ src.occupant.adjustBrainLoss(-((speed_coeff/2))) //So clones don't die of oxyloss in a running pod. - if (src.occupant.reagents.get_reagent_amount("inaprovaline") < 30) - src.occupant.reagents.add_reagent("inaprovaline", 60) + if (src.occupant.reagents.get_reagent_amount("ephedrine") < 30) + src.occupant.reagents.add_reagent("ephedrine", 60) use_power(7500) //This might need tweaking. return diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1755280de31..d5461e99531 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -764,11 +764,11 @@ icon_deny = "med-deny" product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access_txt = "5" - products = list(/obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 4, + products = list(/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4,/obj/item/weapon/reagent_containers/glass/bottle/ephedrine = 4, /obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4, /obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,/obj/item/weapon/reagent_containers/hypospray/medipen = 5, /obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2, /obj/item/device/sensor_device = 2) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6) + contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/charcoal = 6) //This one's from bay12 @@ -787,8 +787,8 @@ icon_deny = "wallmed-deny" req_access_txt = "5" density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude - products = list(/obj/item/stack/medical/bruise_pack = 2,/obj/item/stack/medical/ointment = 2,/obj/item/weapon/reagent_containers/hypospray/medipen = 4,/obj/item/device/healthanalyzer = 1) - contraband = list(/obj/item/weapon/reagent_containers/syringe/antitoxin = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) + products = list(/obj/item/weapon/reagent_containers/pill/patch/styptic = 2,/obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 2,/obj/item/weapon/reagent_containers/hypospray/medipen = 4,/obj/item/device/healthanalyzer = 1) + contraband = list(/obj/item/weapon/reagent_containers/syringe/charcoal = 4,/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/pill/tox = 1) /obj/machinery/vending/wallmed2 name = "\improper NanoMed" @@ -797,8 +797,8 @@ icon_deny = "wallmed-deny" req_access_txt = "5" density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude - products = list(/obj/item/weapon/reagent_containers/hypospray/medipen = 5,/obj/item/weapon/reagent_containers/syringe/antitoxin = 3,/obj/item/stack/medical/bruise_pack = 3, - /obj/item/stack/medical/ointment =3,/obj/item/device/healthanalyzer = 3) + products = list(/obj/item/weapon/reagent_containers/hypospray/medipen = 5,/obj/item/weapon/reagent_containers/syringe/charcoal = 3,/obj/item/weapon/reagent_containers/pill/patch/styptic = 3, + /obj/item/weapon/reagent_containers/pill/patch/silver_sulf =3,/obj/item/device/healthanalyzer = 3) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3) /obj/machinery/vending/security diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 5208671d792..08482312d4b 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -232,8 +232,8 @@ M.AdjustStunned(-4) M.AdjustWeakened(-4) M.AdjustStunned(-4) - if(M.reagents.get_reagent_amount("inaprovaline") < 5) - M.reagents.add_reagent("inaprovaline", 5) + if(M.reagents.get_reagent_amount("ephedrine") < 5) + M.reagents.add_reagent("ephedrine", 5) S.chassis.use_power(S.energy_drain) S.update_equip_info() return @@ -260,7 +260,7 @@ ..() flags |= NOREACT syringes = new - known_reagents = list("inaprovaline"="Inaprovaline","anti_toxin"="Anti-Toxin (Dylovene)") + known_reagents = list("ephedrine"="Ephedrine","charcoal"="Charcoal") processed_reagents = new create_reagents(max_volume) synth = new (list(src),0) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 976bdb5b3c7..f978ebbb577 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -151,8 +151,8 @@ MASS SPECTROMETER if(!(D.visibility_flags & HIDDEN_SCANNER)) user.show_message("Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]", 1) - if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) - user.show_message("Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.", 1) + if (M.reagents && M.reagents.get_reagent_amount("ephedrine")) + user.show_message("Bloodstream Analysis located [M.reagents:get_reagent_amount("ephedrine")] units of rejuvenation chemicals.", 1) if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain)) user.show_message("Subject brain function is non-existant.", 1) else if (M.getBrainLoss() >= 60) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index cd048e95adb..674f3cabf82 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -195,8 +195,8 @@ imp_in.update_canmove() imp_in.reagents.add_reagent("synaptizine", 10) - imp_in.reagents.add_reagent("tricordrazine", 10) - imp_in.reagents.add_reagent("hyperzine", 10) + imp_in.reagents.add_reagent("omnizine", 10) + imp_in.reagents.add_reagent("morphine", 10) /obj/item/weapon/implant/emp diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 3995d527137..8b736d62b49 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -124,7 +124,7 @@ /obj/item/weapon/storage/box/medipens name = "box of medipens" - desc = "A box full of inaprovaline MediPens." + desc = "A box full of ephedrine MediPens." icon_state = "syringe" /obj/item/weapon/storage/box/medipens/New() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index ec4770e255d..408042827bb 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -29,13 +29,13 @@ icon_state = pick("ointment","firefirstaid") - new /obj/item/device/healthanalyzer( src ) - new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) - new /obj/item/stack/medical/ointment( src ) - new /obj/item/stack/medical/ointment( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) //Replaced ointment with these since they actually work --Errorage + new /obj/item/device/healthanalyzer(src) + new /obj/item/weapon/reagent_containers/hypospray/medipen(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) return @@ -45,11 +45,11 @@ /obj/item/weapon/storage/firstaid/regular/New() ..() if (empty) return - new /obj/item/stack/medical/bruise_pack(src) - new /obj/item/stack/medical/bruise_pack(src) - new /obj/item/stack/medical/bruise_pack(src) - new /obj/item/stack/medical/ointment(src) - new /obj/item/stack/medical/ointment(src) + new /obj/item/weapon/reagent_containers/pill/patch/styptic(src) + new /obj/item/weapon/reagent_containers/pill/patch/styptic(src) + new /obj/item/weapon/reagent_containers/pill/patch/styptic(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf(src) new /obj/item/device/healthanalyzer(src) new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) return @@ -66,12 +66,12 @@ icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3") - new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) - new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) - new /obj/item/weapon/reagent_containers/syringe/antitoxin( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) + new /obj/item/weapon/reagent_containers/syringe/charcoal( src ) + new /obj/item/weapon/reagent_containers/syringe/charcoal( src ) + new /obj/item/weapon/reagent_containers/syringe/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) new /obj/item/device/healthanalyzer( src ) return @@ -84,10 +84,10 @@ /obj/item/weapon/storage/firstaid/o2/New() ..() if (empty) return - new /obj/item/weapon/reagent_containers/pill/dexalin( src ) - new /obj/item/weapon/reagent_containers/pill/dexalin( src ) - new /obj/item/weapon/reagent_containers/pill/dexalin( src ) - new /obj/item/weapon/reagent_containers/pill/dexalin( src ) + new /obj/item/weapon/reagent_containers/pill/salbutamol( src ) + new /obj/item/weapon/reagent_containers/pill/salbutamol( src ) + new /obj/item/weapon/reagent_containers/pill/salbutamol( src ) + new /obj/item/weapon/reagent_containers/pill/salbutamol( src ) new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) new /obj/item/weapon/reagent_containers/hypospray/medipen( src ) new /obj/item/device/healthanalyzer( src ) @@ -105,8 +105,8 @@ new /obj/item/clothing/tie/stethoscope( src ) new /obj/item/weapon/surgicaldrill ( src ) new /obj/item/weapon/reagent_containers/hypospray/combat( src ) - new /obj/item/weapon/reagent_containers/pill/bicaridine( src ) - new /obj/item/weapon/reagent_containers/pill/dermaline( src ) + new /obj/item/weapon/reagent_containers/pill/patch/styptic( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) new /obj/item/weapon/reagent_containers/syringe/lethal/choral( src ) new /obj/item/clothing/glasses/hud/health/night( src ) return @@ -149,47 +149,48 @@ return return -/obj/item/weapon/storage/pill_bottle/kelotane - name = "bottle of kelotane pills" - desc = "Contains pills used to treat burns." +/obj/item/weapon/storage/box/silver_sulf + name = "box of silver sulfadiazine patches" + desc = "Contains patches used to treat burns." -/obj/item/weapon/storage/pill_bottle/kelotane/New() +/obj/item/weapon/storage/box/silver_sulf/New() ..() - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) + new /obj/item/weapon/reagent_containers/pill/patch/silver_sulf( src ) -/obj/item/weapon/storage/pill_bottle/antitox - name = "bottle of anti-toxin pills" + +/obj/item/weapon/storage/pill_bottle/charcoal + name = "bottle of charcoal pills" desc = "Contains pills used to counter toxins." -/obj/item/weapon/storage/pill_bottle/antitox/New() +/obj/item/weapon/storage/pill_bottle/charcoal/New() ..() - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) + new /obj/item/weapon/reagent_containers/pill/charcoal( src ) -/obj/item/weapon/storage/pill_bottle/inaprovaline - name = "bottle of inaprovaline pills" +/obj/item/weapon/storage/pill_bottle/ephedrine + name = "bottle of ephedrine pills" desc = "Contains pills used to stabilize patients." -/obj/item/weapon/storage/pill_bottle/inaprovaline/New() +/obj/item/weapon/storage/pill_bottle/ephedrine/New() ..() - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) + new /obj/item/weapon/reagent_containers/pill/ephedrine( src ) /obj/item/weapon/storage/pill_bottle/stimulant name = "bottle of stimulant pills" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 247ee620425..60a34de16fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -17,10 +17,10 @@ new /obj/item/weapon/reagent_containers/dropper(src) new /obj/item/weapon/reagent_containers/glass/beaker(src) new /obj/item/weapon/reagent_containers/glass/beaker(src) - new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) - new /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline(src) - new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) - new /obj/item/weapon/reagent_containers/glass/bottle/antitoxin(src) + new /obj/item/weapon/reagent_containers/glass/bottle/ephedrine(src) + new /obj/item/weapon/reagent_containers/glass/bottle/ephedrine(src) + new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src) + new /obj/item/weapon/reagent_containers/glass/bottle/charcoal(src) return diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 47d2d3aede6..93b9129c189 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -23,7 +23,7 @@ var/mob/living/carbon/affecting = null//The wearer. var/obj/item/weapon/stock_parts/cell/cell//Starts out with a high-capacity cell using New(). var/datum/effect/effect/system/spark_spread/spark_system//To create sparks. - var/reagent_list[] = list("tricordrazine","dexalinp","spaceacillin","anti_toxin","nutriment","radium","hyronalin")//The reagents ids which are added to the suit at New(). + var/reagent_list[] = list("omnizine","salbutamol","spaceacillin","charcoal","nutriment","radium","potass_iodide")//The reagents ids which are added to the suit at New(). var/stored_research[]//For stealing station research. var/obj/item/weapon/disk/tech_disk/t_disk//To copy design onto disk. diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index 9c50288dd9a..6037b853a90 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -28,7 +28,7 @@ var/obj/vent = pick_n_take(vents) if(vent && vent.loc) var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube", - "plantbgone","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid") + "plantbgone","banana","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","pacid") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = vent R.add_reagent(pick(gunk), 50) diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm index a48ad6eba8b..5a1d222bda7 100644 --- a/code/modules/food&drinks/food/snacks.dm +++ b/code/modules/food&drinks/food/snacks.dm @@ -205,7 +205,7 @@ //Notes by Darem: Food in the "snacks" subtype can hold a maximum of 50 units Generally speaking, you don't want to go over 40 // total for the item because you want to leave space for extra condiments. If you want effect besides healing, add a reagent for -// it. Try to stick to existing reagents when possible (so if you want a stronger healing effect, just use Tricordrazine). On use +// it. Try to stick to existing reagents when possible (so if you want a stronger healing effect, just use omnizine). On use // effect (such as the old officer eating a donut code) requires a unique reagent (unless you can figure out a better way). //The nutriment reagent and bitesize variable replace the old heal_amt and amount variables. Each unit of nutriment is equal to diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm index e74d7a0d951..d72dec3a3f3 100644 --- a/code/modules/food&drinks/food/snacks_cake.dm +++ b/code/modules/food&drinks/food/snacks_cake.dm @@ -9,7 +9,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/store/carrotcake/New() ..() reagents.add_reagent("nutriment", 20) - reagents.add_reagent("imidazoline", 10) + reagents.add_reagent("oculine", 10) reagents.add_reagent("vitamin", 5) bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm index fa03921b1e2..191739db7da 100644 --- a/code/modules/food&drinks/food/snacks_meat.dm +++ b/code/modules/food&drinks/food/snacks_meat.dm @@ -83,7 +83,7 @@ /obj/item/weapon/reagent_containers/food/snacks/bearmeat/New() ..() reagents.add_reagent("nutriment", 12) - reagents.add_reagent("hyperzine", 5) + reagents.add_reagent("morphine", 5) reagents.add_reagent("vitamin", 2) src.bitesize = 3 @@ -278,7 +278,7 @@ eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 10) reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) + reagents.add_reagent("oculine", 5) reagents.add_reagent("water", 5) bitesize = 10 diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm index ce6a4650934..f8b392e0e61 100644 --- a/code/modules/food&drinks/food/snacks_other.dm +++ b/code/modules/food&drinks/food/snacks_other.dm @@ -165,7 +165,7 @@ /obj/item/weapon/reagent_containers/food/snacks/carrotfries/New() ..() reagents.add_reagent("nutriment", 3) - reagents.add_reagent("imidazoline", 3) + reagents.add_reagent("oculine", 3) reagents.add_reagent("vitamin", 2) bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm index 4860f4fd103..85b5231cf78 100644 --- a/code/modules/food&drinks/food/snacks_pastry.dm +++ b/code/modules/food&drinks/food/snacks_pastry.dm @@ -51,7 +51,7 @@ if(9) reagents.add_reagent("berryjuice", 3) if(10) - reagents.add_reagent("tricordrazine", 3) + reagents.add_reagent("omnizine", 3) if(prob(30)) icon_state = "donut2" name = "frosted chaos donut" @@ -249,7 +249,7 @@ name = "exceptional plump helmet biscuit" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" reagents.add_reagent("nutriment", 3) - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent("omnizine", 5) reagents.add_reagent("nutriment", 5) reagents.add_reagent("vitamin", 1) bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm index 7894ea3c301..2937ee70a55 100644 --- a/code/modules/food&drinks/food/snacks_pie.dm +++ b/code/modules/food&drinks/food/snacks_pie.dm @@ -78,7 +78,7 @@ if(prob(10)) name = "exceptional plump pie" desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent("omnizine", 5) reagents.add_reagent("nutriment", 8) reagents.add_reagent("vitamin", 4) diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm index 2469d35fbb1..6b370d5dcb2 100644 --- a/code/modules/food&drinks/food/snacks_pizza.dm +++ b/code/modules/food&drinks/food/snacks_pizza.dm @@ -74,7 +74,7 @@ ..() reagents.add_reagent("nutriment", 25) reagents.add_reagent("tomatojuice", 6) - reagents.add_reagent("imidazoline", 12) + reagents.add_reagent("oculine", 12) reagents.add_reagent("vitamin", 5) bitesize = 2 diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm index 3b0ad13e3cb..35d5a0f66ac 100644 --- a/code/modules/food&drinks/food/snacks_salad.dm +++ b/code/modules/food&drinks/food/snacks_salad.dm @@ -11,7 +11,7 @@ ..() eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp") reagents.add_reagent("nutriment", 8) - reagents.add_reagent("tricordrazine", 8) + reagents.add_reagent("omnizine", 8) reagents.add_reagent("vitamin", 6) bitesize = 3 diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm index f9aa75f6eb9..92fbe50250b 100644 --- a/code/modules/food&drinks/food/snacks_soup.dm +++ b/code/modules/food&drinks/food/snacks_soup.dm @@ -79,7 +79,7 @@ eatverb = pick("slurp","sip","suck","inhale","drink") reagents.add_reagent("nutriment", 8) reagents.add_reagent("water", 5) - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent("omnizine", 5) reagents.add_reagent("vitamin", 5) bitesize = 5 @@ -104,7 +104,7 @@ if(3) reagents.add_reagent("nutriment", 5) reagents.add_reagent("water", 5) - reagents.add_reagent("tricordrazine", 5) + reagents.add_reagent("omnizine", 5) if(4) reagents.add_reagent("nutriment", 5) reagents.add_reagent("water", 10) @@ -126,7 +126,7 @@ if(10) reagents.add_reagent("nutriment", 6) reagents.add_reagent("tomatojuice", 5) - reagents.add_reagent("imidazoline", 5) + reagents.add_reagent("oculine", 5) bitesize = 5 /obj/item/weapon/reagent_containers/food/snacks/wishsoup diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm index 014669ec4ad..6419bf0f3d6 100644 --- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm +++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm @@ -310,8 +310,8 @@ obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay /obj/machinery/smartfridge/chemistry name = "smart chemical storage" desc = "A refrigerated storage unit for medicine storage." - var/list/spawn_meds = list(/obj/item/weapon/reagent_containers/pill/inaprovaline = 12,/obj/item/weapon/reagent_containers/pill/antitox = 1, - /obj/item/weapon/reagent_containers/glass/bottle/inaprovaline = 1, /obj/item/weapon/reagent_containers/glass/bottle/antitoxin = 1) + var/list/spawn_meds = list(/obj/item/weapon/reagent_containers/pill/ephedrine = 12,/obj/item/weapon/reagent_containers/pill/charcoal = 1, + /obj/item/weapon/reagent_containers/glass/bottle/ephedrine = 1, /obj/item/weapon/reagent_containers/glass/bottle/charcoal = 1) /obj/machinery/smartfridge/chemistry/New() ..() diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm index 27d18b40ac9..92e19a356da 100644 --- a/code/modules/food&drinks/recipes/drinks_recipes.dm +++ b/code/modules/food&drinks/recipes/drinks_recipes.dm @@ -178,7 +178,7 @@ name = "The Doctor's Delight" id = "doctordelight" result = "doctorsdelight" - required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "tricordrazine" = 1) + required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 1, "omnizine" = 1) result_amount = 5 /datum/chemical_reaction/irish_cream diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 54f4d2e3df1..36e7d97b11d 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -131,7 +131,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/poppy/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) - reagents.add_reagent("bicaridine", 1 + round((potency / 10), 1)) + reagents.add_reagent("salglu_solution", 1 + round((potency / 10), 1)) bitesize = 1 + round(reagents.total_volume / 3, 1) @@ -199,7 +199,7 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/grapes/green/add_juice() ..() - reagents.add_reagent("kelotane", 3 + round((potency / 5), 1)) + reagents.add_reagent("salglu_solution", 3 + round((potency / 5), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage @@ -320,8 +320,8 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris/add_juice() ..() reagents.add_reagent("space_drugs", 1 + round(potency / 8, 1)) - reagents.add_reagent("kelotane", 1 + round(potency / 8, 1)) - reagents.add_reagent("bicaridine", 1 + round(potency / 10, 1)) + reagents.add_reagent("salglu_solution", 1 + round(potency / 8, 1)) + reagents.add_reagent("salglu_solution", 1 + round(potency / 10, 1)) reagents.add_reagent("toxin", 1 + round(potency / 10, 1)) reagents.add_reagent("vitamin", 1 + round((potency / 20), 1)) @@ -334,9 +334,9 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus/add_juice() ..() - reagents.add_reagent("bicaridine", 1 + round(potency / 8, 1)) + reagents.add_reagent("omnizine", 1 + round(potency / 8, 1)) reagents.add_reagent("synaptizine", 1 + round(potency / 8, 1)) - reagents.add_reagent("hyperzine", 1 + round(potency / 10, 1)) + reagents.add_reagent("morphine", 1 + round(potency / 10, 1)) reagents.add_reagent("space_drugs", 1 + round(potency / 10, 1)) reagents.add_reagent("vitamin", 1 + round((potency / 10), 1)) @@ -816,7 +816,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/kudzupod/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 50), 1)) - reagents.add_reagent("anti_toxin", 1 + round((potency / 25), 1)) + reagents.add_reagent("charcoal", 1 + round((potency / 25), 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) @@ -830,7 +830,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() if(..()) reagents.add_reagent("nutriment", 1 + round((potency / 20), 1)) reagents.add_reagent("vitamin", 1 + round((potency / 20), 1)) - reagents.add_reagent("imidazoline", 3+round(potency / 5, 1)) + reagents.add_reagent("oculine", 3+round(potency / 5, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) @@ -843,14 +843,14 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/add_juice() ..() reagents.add_reagent("nutriment", 1) - reagents.add_reagent("anti_toxin", 3+round(potency / 3, 1)) + reagents.add_reagent("charcoal", 3+round(potency / 3, 1)) reagents.add_reagent("stoxin", 3+round(potency / 3, 1)) bitesize = 1 + round(reagents.total_volume / 2, 1) /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) - user << "- Anti-Toxin: [reagents.get_reagent_amount("anti_toxin")]%" + user << "- Anti-Toxin: [reagents.get_reagent_amount("charcoal")]%" user << "- Sleep Toxin: [reagents.get_reagent_amount("stoxin")]%" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita @@ -1080,7 +1080,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta/add_juice(var/loc, var/potency = 20) ..() - reagents.add_reagent("hyperzine", 1 + round((potency / 20), 1)) + reagents.add_reagent("morphine", 1 + round((potency / 20), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco seed = /obj/item/seeds/tobacco_seed @@ -1102,7 +1102,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space/add_juice() ..() - reagents.add_reagent("dexalin", 1 + round((potency / 20), 1)) + reagents.add_reagent("salbutamol", 1 + round((potency / 20), 1)) /obj/item/weapon/reagent_containers/food/snacks/grown/tea //abstract type @@ -1130,4 +1130,4 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice() /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra/add_juice() ..() - reagents.add_reagent("kelotane", 1 + round((potency / 20), 1)) \ No newline at end of file + reagents.add_reagent("salglu_solution", 1 + round((potency / 20), 1)) \ No newline at end of file diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 394c9036da6..ee62550b3b7 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -445,8 +445,8 @@ obj/machinery/hydroponics/proc/applyChemicals(var/datum/reagents/S) adjustNutri(round(S.get_reagent_amount("robustharvestnutriment") *1 )) // Antitoxin binds shit pretty well. So the tox goes significantly down - if(S.has_reagent("anti_toxin", 1)) - adjustToxic(-round(S.get_reagent_amount("anti_toxin") * 2)) + if(S.has_reagent("charcoal", 1)) + adjustToxic(-round(S.get_reagent_amount("charcoal") * 2)) // NIGGA, YOU JUST WENT ON FULL RETARD. if(S.has_reagent("toxin", 1)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 9fbb635bb06..2811439e517 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -99,7 +99,7 @@ if( health <= 20 && prob(1) ) spawn(0) emote("gasp") - if(!reagents.has_reagent("inaprovaline")) + if(!reagents.has_reagent("ephedrine")) adjustOxyLoss(1) Paralyse(3) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 955ca3030f9..87f2da3e993 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -77,7 +77,7 @@ //if( health <= 20 && prob(1) ) // spawn(0) // emote("gasp") - if(!reagents.has_reagent("inaprovaline")) + if(!reagents.has_reagent("ephedrine")) adjustOxyLoss(1) Paralyse(3) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index c55d0783b7c..68f39e1b9df 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1075,7 +1075,7 @@ return if(!breath || (breath.total_moles() == 0)) - if(H.reagents.has_reagent("inaprovaline")) + if(H.reagents.has_reagent("ephedrine")) return if(H.health >= config.health_threshold_crit) if(NOBREATH in specflags) return 1 diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 689d0314d95..04c4a1567fb 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -359,7 +359,7 @@ if( health <= 20 && prob(1) ) spawn(0) emote("gasp") - if(!reagents.has_reagent("inaprovaline")) + if(!reagents.has_reagent("ephedrine")) adjustOxyLoss(1) Paralyse(3) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 00cd806ec0f..7bdbfb459da 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -36,7 +36,7 @@ /mob/living/carbon/monkey/movement_delay() var/tally = 0 if(reagents) - if(reagents.has_reagent("hyperzine")) return -1 + if(reagents.has_reagent("morphine")) return -1 if(reagents.has_reagent("nuka_cola")) return -1 diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm index e4122c9e01a..743c5135ad1 100644 --- a/code/modules/mob/living/carbon/slime/life.dm +++ b/code/modules/mob/living/carbon/slime/life.dm @@ -174,9 +174,9 @@ if (reagents.get_reagent_amount("plasma")>=5) mutation_chance = min(mutation_chance + 5,50) //Prevents mutation chance going >50% reagents.remove_reagent("plasma", 5) - if (reagents.get_reagent_amount("inaprovaline")>=5) + if (reagents.get_reagent_amount("ephedrine")>=5) mutation_chance = max(mutation_chance - 5,0) //Prevents muation chance going <0% - reagents.remove_reagent("inaprovaline", 5) + reagents.remove_reagent("ephedrine", 5) src.updatehealth() return //TODO: DEFERRED @@ -194,7 +194,7 @@ else if(src.health < config.health_threshold_crit) - if(!src.reagents.has_reagent("inaprovaline")) + if(!src.reagents.has_reagent("ephedrine")) src.adjustOxyLoss(10) if(src.stat != DEAD) diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 4e7020c3f3b..d0703c45ccd 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -87,7 +87,7 @@ tally += (283.222 - bodytemperature) / 10 * 1.75 if(reagents) - if(reagents.has_reagent("hyperzine")) // Hyperzine slows slimes down + if(reagents.has_reagent("morphine")) // morphine slows slimes down tally *= 2 if(reagents.has_reagent("frostoil")) // Frostoil also makes them move VEEERRYYYYY slow diff --git a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm index 3a8a0e7f449..2570f4232e7 100644 --- a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm +++ b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm @@ -19,9 +19,10 @@ datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob) M.AdjustStunned(-1) M.adjustStaminaLoss(-1*REM) if(volume > 35) - M << "You feel like you smoked too much." - M.adjustToxLoss(2*REM) - M.adjustOxyLoss(2*REM) + if(prob(20)) + M << "You feel like you smoked too much." + M.adjustToxLoss(1*REM) + M.adjustOxyLoss(1*REM) ..() return @@ -81,7 +82,7 @@ datum/reagent/crank/on_mob_life(var/mob/living/M as mob) M << "Your skin feels loose..." if(cycle_count == 50) M << "Your skin falls off!" - M.adjustBruteLoss(rand(10,30)*REM) + M.adjustBruteLoss(rand(50,80)*REM) // holy shit your skin just FELL THE FUCK OFF hardset_dna(M, null, null, null, null, /datum/species/skeleton) if(volume > 20) overdosed = 1 @@ -94,7 +95,7 @@ datum/reagent/crank/on_mob_life(var/mob/living/M as mob) name = "Krokodil" id = "krokodil" result = "krokodil" - required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorous" = 1, "fuel" = 1) + required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1) result_amount = 6 mix_message = "The mixture dries into a pale blue powder." required_temp = 380 \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Goon-Medicine.dm b/code/modules/reagents/Chemistry-Goon-Medicine.dm index 4c83e5a1187..f2b5c9dad55 100644 --- a/code/modules/reagents/Chemistry-Goon-Medicine.dm +++ b/code/modules/reagents/Chemistry-Goon-Medicine.dm @@ -59,16 +59,15 @@ datum/reagent/styptic_powder/on_mob_life(var/mob/living/M as mob) datum/reagent/salglu_solution name = "Saline-Glucose Solution" id = "salglu_solution" - description = "100% chance per cycle of healing 1 point each of OXY and TOX damage." + description = "33% chance per cycle of healing 1 point each of BRUTE and BURN damage." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob) - if(M.stat == DEAD) - return if(!M) M = holder.my_atom - if(M.getOxyLoss()) M.adjustOxyLoss(-1*REM) - if(M.getToxLoss()) M.adjustToxLoss(-1*REM) + if(prob(33)) + M.adjustBruteLoss(-1*REM) + M.adjustFireLoss(-1*REM) ..() return @@ -98,8 +97,8 @@ datum/reagent/charcoal datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom M.adjustToxLoss(-1.5*REM) - for(var/datum/reagent/R in M.reagents) - if(M != src) + for(var/datum/reagent/R in M.reagents.reagent_list) + if(R != src) M.reagents.remove_reagent(R.id,0.5) ..() return @@ -168,8 +167,8 @@ datum/reagent/calomel datum/reagent/calomel/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - for(var/datum/reagent/R in M.reagents) - if(M != src) + for(var/datum/reagent/R in M.reagents.reagent_list) + if(R != src) M.reagents.remove_reagent(R.id,5) if(M.health > 20) M.adjustToxLoss(5*REM) @@ -224,8 +223,8 @@ datum/reagent/pen_acid/on_mob_life(var/mob/living/M as mob) M.adjustBruteLoss(1*REM) if(M.radiation < 0) M.radiation = 0 - for(var/datum/reagent/R in M.reagents) - if(M != src) + for(var/datum/reagent/R in M.reagents.reagent_list) + if(R != src) M.reagents.remove_reagent(R.id,4) ..() return @@ -326,6 +325,7 @@ datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob) M.AdjustStunned(-1) M.AdjustWeakened(-1) M.adjustStaminaLoss(-1*REM) + M.adjustOxyLoss(-1*REM) ..() return @@ -378,4 +378,181 @@ datum/reagent/morphine/on_mob_life(var/mob/living/M as mob) M.drop_item() cycle_count++ ..() - return \ No newline at end of file + return + +datum/reagent/oculine/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + cycle_amount++ + if(M.eye_blind > 0 && cycle_amount > 20) + if(prob(30)) + M.eye_blind = 0 + else if(prob(80)) + M.eye_blind = 0 + M.eye_blurry = 1 + if(M.eye_blurry > 0) + if(prob(80)) + M.eye_blurry = 0 + ..() + return + +/datum/chemical_reaction/oculine + name = "Oculine" + id = "oculine" + result = "oculine" + required_reagents = list("atropine" = 1, "spaceacillin" = 1, "salglu_solution" = 1) + result_amount = 3 + mix_message = "The mixture sputters loudly and becomes a pale pink color." + +datum/reagent/oculine + name = "Oculine" + id = "oculine" + description = "30% chance to remove blindness, 80% chance to slightly reduce eye damage." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.4 + var/cycle_amount = 0 + +datum/reagent/atropine + name = "Atropine" + id = "atropine" + description = "1 TOX damage if used over -60 health. Causes dizziness and confusion. If under -25 health, heals 3 BRUTE + 3 BURN. Attempts to cap OXY damage at 65 and LOSEBREATH at 5." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.2 + +datum/reagent/atropine/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(M.health > 60) + M.adjustToxLoss(1*REM) + if(M.health < 25) + M.adjustBruteLoss(3*REM) + M.adjustFireLoss(3*REM) + if(M.oxyloss > 65) + M.setOxyLoss(65) + if(M.losebreath > 5) + M.losebreath = 5 + if(prob(30)) + M.Dizzy(5) + M.Jitter(5) + ..() + return + +/datum/chemical_reaction/atropine + name = "Atropine" + id = "atropine" + result = "atropine" + required_reagents = list("ethanol" = 1, "acetone" = 1, "diethylamine" = 1, "phenol" = 1, "sacid" = 1) + result_amount = 5 + +datum/reagent/strange_reagent + name = "Strange Reagent" + id = "strange_reagent" + description = "A miracle medical chem, this little beauty can bring the dead back to life! ...Well, if you're careful that is. If the cadaver is rotten or has too much BRUTE/BURN damage, SR will gib them on use." + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.2 + +datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) + if(M.bruteloss > 80 || M.fireloss > 80) + if(ishuman(M) || ismonkey(M)) + var/mob/living/carbon/C_target = M + var/obj/item/organ/brain/B = C_target.getorgan(/obj/item/organ/brain) + if(B) + B.loc = get_turf(C_target) + B.transfer_identity(C_target) + C_target.internal_organs -= B + M.gib() + else if(M.stat == DEAD) + M.stat = CONSCIOUS + M.adjustOxyLoss(-50*REM) + M.adjustBruteLoss(-50*REM) + M.adjustToxLoss(-50*REM) + M.adjustFireLoss(-50*REM) + M << "You surge back to life!" + ..() + return + +datum/reagent/strange_reagent/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(prob(rand(1,100))) + M.adjustBruteLoss(2*REM) + M.adjustFireLoss(2*REM) + ..() + return + +/datum/chemical_reaction/strange_reagent + name = "Strange Reagent" + id = "strange_reagent" + result = "strange_reagent" + required_reagents = list("omnizine" = 1, "holywater" = 1, "mutagen" = 1) + result_amount = 3 + +datum/reagent/life + name = "Life" + id = "life" + description = "" + reagent_state = LIQUID + color = "#C8A5DC" // rgb: 200, 165, 220 + metabolization_rate = 0.2 + +/datum/chemical_reaction/life + name = "Life" + id = "life" + result = "life" + required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "blood" = 1) + result_amount = 3 + required_temp = 374 + +/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume) + if(holder && holder.my_atom) + var/blocked = list(/mob/living/simple_animal/hostile, + /mob/living/simple_animal/hostile/pirate, + /mob/living/simple_animal/hostile/pirate/ranged, + /mob/living/simple_animal/hostile/russian, + /mob/living/simple_animal/hostile/russian/ranged, + /mob/living/simple_animal/hostile/syndicate, + /mob/living/simple_animal/hostile/syndicate/melee, + /mob/living/simple_animal/hostile/syndicate/melee/space, + /mob/living/simple_animal/hostile/syndicate/ranged, + /mob/living/simple_animal/hostile/syndicate/ranged/space, + /mob/living/simple_animal/hostile/alien/queen/large, + /mob/living/simple_animal/hostile/retaliate, + /mob/living/simple_animal/hostile/retaliate/clown, + /mob/living/simple_animal/hostile/mushroom, + /mob/living/simple_animal/hostile/asteroid, + /mob/living/simple_animal/hostile/asteroid/basilisk, + /mob/living/simple_animal/hostile/asteroid/goldgrub, + /mob/living/simple_animal/hostile/asteroid/goliath, + /mob/living/simple_animal/hostile/asteroid/hivelord, + /mob/living/simple_animal/hostile/asteroid/hivelordbrood, + /mob/living/simple_animal/hostile/carp/holocarp, + /mob/living/simple_animal/hostile/mining_drone + )//exclusion list for things you don't want the reaction to create. + var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs + var/atom/A = holder.my_atom + var/turf/T = get_turf(A) + var/area/my_area = get_area(T) + var/message = "A life reaction has occured in [my_area.name]. (JMP)" + message += " (VV)" + + var/mob/M = get(A, /mob) + if(M) + message += " - Carried By: [M.real_name] ([M.key]) (PP) (?)" + else + message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]" + + message_admins(message, 0, 1) + + playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) + + for(var/mob/living/carbon/human/H in viewers(get_turf(holder.my_atom), null)) + if(H:eyecheck() <= 0) + flick("e_flash", H.flash) + for(var/i = 1, i <= 5, i++) + var/chosen = pick(critters) + var/mob/living/simple_animal/hostile/C = new chosen + C.faction |= "lifesummon" + C.loc = get_turf(holder.my_atom) + if(prob(50)) + for(var/j = 1, j <= rand(1, 3), j++) + step(C, pick(NORTH,SOUTH,EAST,WEST)) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm index 6edcc664817..45753e75dc0 100644 --- a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm +++ b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm @@ -25,10 +25,17 @@ result_amount = 4 required_temp = 424 +datum/reagent/clf3/on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + M.adjustFireLoss(1*REM) + ..() + return + /datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume) var/turf/simulated/T = get_turf(holder.my_atom) - for(var/turf/simulated/turf in orange(1,T)) + for(var/turf/simulated/turf in range(1,T)) new /obj/effect/hotspot(turf) + new /obj/effect/hotspot(T) return /datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume) @@ -38,6 +45,12 @@ F.make_plating() if(prob(11)) F.ChangeTurf(/turf/space) + if(istype(F, /turf/simulated/floor/)) + new /obj/effect/hotspot(F) + if(istype(T, /turf/simulated/wall/)) + var/turf/simulated/wall/W = T + if(prob(33)) + W.ChangeTurf(/turf/simulated/floor) return /datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) @@ -45,6 +58,8 @@ return if(method == TOUCH) M.adjust_fire_stacks(20) + M.IgniteMob() + new /obj/effect/hotspot(M.loc) return /datum/reagent/sorium diff --git a/code/modules/reagents/Chemistry-Goon-Toxins.dm b/code/modules/reagents/Chemistry-Goon-Toxins.dm index 3361df63c77..355962d588a 100644 --- a/code/modules/reagents/Chemistry-Goon-Toxins.dm +++ b/code/modules/reagents/Chemistry-Goon-Toxins.dm @@ -29,11 +29,11 @@ datum/reagent/histamine datum/reagent/histamine/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(volume >= 20) - M.adjustOxyLoss(pick(5,10)*REM) - M.adjustBruteLoss(pick(5,10)*REM) - M.adjustToxLoss(pick(5,10)*REM) - if(volume < 20) + if(volume >= 30) + M.adjustOxyLoss(pick(2,5)*REM) + M.adjustBruteLoss(pick(2,5)*REM) + M.adjustToxLoss(pick(2,5)*REM) + if(volume < 30) switch(pick(1, 2, 3)) if(1) M << "You are unable to look straight!" @@ -101,7 +101,7 @@ datum/reagent/neurotoxin2 datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob) cycle_count++ if(!M) M = holder.my_atom - if(!(M.brainloss + M.toxloss) >= 60) + if(M.brainloss + M.toxloss <= 60) M.adjustBrainLoss(1*REM) M.adjustToxLoss(1*REM) if(cycle_count == 17) @@ -132,7 +132,7 @@ datum/reagent/cyanide/on_mob_life(var/mob/living/M as mob) M.adjustOxyLoss(1*REM) if(prob(8)) M.sleeping += 1 - M.adjustToxLoss(4*REM) + M.adjustToxLoss(2*REM) ..() return diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index dde04bfbc43..cbe787af8fd 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -11,6 +11,7 @@ datum/reagents var/maximum_volume = 100 var/atom/my_atom = null var/chem_temp = 150 + var/last_tick = 0 datum/reagents/New(maximum=100) maximum_volume = maximum @@ -198,9 +199,10 @@ datum/reagents/proc/metabolize(var/mob/M) for(var/A in reagent_list) var/datum/reagent/R = A if(M && R) - if(M.reagent_check(R) != 1) + if(M.reagent_check(R) != 1 && last_tick == 3) R.on_mob_life(M) - + last_tick = 0 + last_tick++ update_total() datum/reagents/proc/conditional_update_move(var/atom/A, var/Running = 0) @@ -324,7 +326,7 @@ datum/reagents/proc/del_reagent(var/reagent) datum/reagents/proc/check_gofast(var/mob/M) if(istype(M, /mob)) - if(M.reagents.has_reagent("hyperzine")||M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")) + if(M.reagents.has_reagent("morphine")||M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")) return 1 else M.status_flags &= ~GOTTAGOFAST diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 9821c71e5b7..490fa312b0d 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -878,9 +878,9 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) //Grinder stuff, but only if dry /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica = list("coffeepowder" = 0), - /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "hyperzine" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/tea/aspera = list("teapowder" = 0), - /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "kelotane" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0), @@ -908,9 +908,9 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime) //Grinder stuff, but only if dry /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/arabica = list("coffeepowder" = 0), - /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "hyperzine" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0), /obj/item/weapon/reagent_containers/food/snacks/grown/tea/aspera = list("teapowder" = 0), - /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "kelotane" = 0), + /obj/item/weapon/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0), ) var/list/holdingitems = list() diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm index 8b8d02eb124..978390a256a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm @@ -399,22 +399,6 @@ datum/reagent/consumable/doctor_delight description = "A gulp a day keeps the MediBot away. That's probably for the best." color = "#FF8CFF" // rgb: 255, 140, 255 -datum/reagent/consumable/doctor_delight/on_mob_life(var/mob/living/M as mob) - if(M.getOxyLoss() && prob(80)) - M.adjustOxyLoss(-2) - if(M.getBruteLoss() && prob(80)) - M.heal_organ_damage(2,0) - if(M.getFireLoss() && prob(80)) - M.heal_organ_damage(0,2) - if(M.getToxLoss() && prob(80)) - M.adjustToxLoss(-2) - if(M.dizziness !=0) - M.dizziness = max(0,M.dizziness-15) - if(M.confused !=0) - M.confused = max(0,M.confused - 5) - holder.remove_reagent(id, metabolization_rate/M.metabolism_efficiency) - return - //////////////////////////////////////////////The ten friggen million reagents that get you drunk////////////////////////////////////////////// diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm index b05bf89826d..f8eef54a6d8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm @@ -44,21 +44,6 @@ datum/reagent/medicine/lipozine/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/hyperzine - name = "Hyperzine" - id = "hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant." - color = "#C8A5DC" // rgb: 200, 165, 220 - metabolization_rate = 0.5 * REAGENTS_METABOLISM - -datum/reagent/medicine/hyperzine/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - if(prob(5)) - M.emote(pick("twitch","blink_r","shiver")) - M.status_flags |= GOTTAGOFAST - ..() - return - datum/reagent/medicine/leporazine name = "Leporazine" id = "leporazine" @@ -72,19 +57,6 @@ datum/reagent/medicine/leporazine/on_mob_life(var/mob/living/M as mob) M.bodytemperature = min(310, M.bodytemperature + (40 * TEMPERATURE_DAMAGE_COEFFICIENT)) ..() -datum/reagent/medicine/inaprovaline - name = "Inaprovaline" - id = "inaprovaline" - description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients." - color = "#C8A5DC" // rgb: 200, 165, 220 - metabolization_rate = 0.5 * REAGENTS_METABOLISM - -datum/reagent/medicine/inaprovaline/on_mob_life(var/mob/living/M as mob) - if(M.losebreath >= 10) - M.losebreath = max(10, M.losebreath-5) - ..() - return - datum/reagent/medicine/ryetalyn name = "Ryetalyn" id = "ryetalyn" @@ -101,92 +73,6 @@ datum/reagent/medicine/ryetalyn/on_mob_life(mob/living/carbon/human/M) ..() return -datum/reagent/medicine/kelotane - name = "Kelotane" - id = "kelotane" - description = "Kelotane is a drug used to treat burns." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/kelotane/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.heal_organ_damage(0,2*REM) - ..() - return - -datum/reagent/medicine/dermaline - name = "Dermaline" - id = "dermaline" - description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/dermaline/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) //THE GUY IS **DEAD**! BEREFT OF ALL LIFE HE RESTS IN PEACE etc etc. He does NOT metabolise shit anymore, god DAMN - M.heal_organ_damage(0,3*REM) - ..() - return - -datum/reagent/medicine/dexalin - name = "Dexalin" - id = "dexalin" - description = "Dexalin is used in the treatment of oxygen deprivation." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/dexalin/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.adjustOxyLoss(-2*REM) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) - ..() - return - -datum/reagent/medicine/dexalinp - name = "Dexalin Plus" - id = "dexalinp" - description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/dexalinp/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.adjustOxyLoss(-M.getOxyLoss()) - if(holder.has_reagent("lexorin")) - holder.remove_reagent("lexorin", 2*REM) - ..() - return - -datum/reagent/medicine/tricordrazine - name = "Tricordrazine" - id = "tricordrazine" - description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/tricordrazine/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - if(M.getOxyLoss() && prob(80)) - M.adjustOxyLoss(-1*REM) - if(M.getBruteLoss() && prob(80)) - M.heal_organ_damage(1*REM,0) - if(M.getFireLoss() && prob(80)) - M.heal_organ_damage(0,1*REM) - if(M.getToxLoss() && prob(80)) - M.adjustToxLoss(-1*REM) - ..() - return - -datum/reagent/medicine/anti_toxin - name = "Anti-Toxin (Dylovene)" - id = "anti_toxin" - description = "Dylovene is a broad-spectrum antitoxin." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/anti_toxin/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.reagents.remove_all_type(/datum/reagent/toxin, 1*REM, 0, 1) - M.drowsyness = max(M.drowsyness-2*REM, 0) - M.hallucination = max(0, M.hallucination - 5*REM) - M.adjustToxLoss(-2*REM) - ..() - return - datum/reagent/medicine/adminordrazine //An OP chemical for admins name = "Adminordrazine" id = "adminordrazine" @@ -245,32 +131,6 @@ datum/reagent/medicine/synaptizine/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/hyronalin - name = "Hyronalin" - id = "hyronalin" - description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/hyronalin/on_mob_life(var/mob/living/M as mob) - M.radiation = max(M.radiation-3*REM,0) - ..() - return - -datum/reagent/medicine/arithrazine - name = "Arithrazine" - id = "arithrazine" - description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/arithrazine/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.radiation = max(M.radiation-7*REM,0) - M.adjustToxLoss(-1*REM) - if(prob(15)) - M.take_organ_damage(1, 0) - ..() - return - datum/reagent/medicine/alkysine name = "Alkysine" id = "alkysine" @@ -283,20 +143,6 @@ datum/reagent/medicine/alkysine/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/imidazoline - name = "Imidazoline" - id = "imidazoline" - description = "Heals eye damage." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/imidazoline/on_mob_life(var/mob/living/M as mob) - M.eye_blurry = max(M.eye_blurry-5 , 0) - M.eye_blind = max(M.eye_blind-5 , 0) - M.disabilities &= ~NEARSIGHT - M.eye_stat = max(M.eye_stat-5, 0) - ..() - return - datum/reagent/medicine/inacusiate name = "Inacusiate" id = "inacusiate" @@ -308,18 +154,6 @@ datum/reagent/medicine/inacusiate/on_mob_life(var/mob/living/M as mob) ..() return -datum/reagent/medicine/bicaridine - name = "Bicaridine" - id = "bicaridine" - description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma." - color = "#C8A5DC" // rgb: 200, 165, 220 - -datum/reagent/medicine/bicaridine/on_mob_life(var/mob/living/M as mob) - if(M.stat != DEAD) - M.heal_organ_damage(2*REM,0) - ..() - return - datum/reagent/medicine/cryoxadone name = "Cryoxadone" id = "cryoxadone" diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm index 9dccb444c59..b469e0263e0 100644 --- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm @@ -61,8 +61,8 @@ datum/reagent/toxin/plasma toxpwr = 3 datum/reagent/toxin/plasma/on_mob_life(var/mob/living/M as mob) - if(holder.has_reagent("inaprovaline")) - holder.remove_reagent("inaprovaline", 2*REM) + if(holder.has_reagent("ephedrine")) + holder.remove_reagent("ephedrine", 2*REM) ..() return diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 4b06fe9e1e6..3e656b768f4 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -69,21 +69,7 @@ silicate name = "Sterilizine" id = "sterilizine" result = "sterilizine" - required_reagents = list("ethanol" = 1, "anti_toxin" = 1, "chlorine" = 1) - result_amount = 3 - -/datum/chemical_reaction/inaprovaline - name = "Inaprovaline" - id = "inaprovaline" - result = "inaprovaline" - required_reagents = list("oxygen" = 1, "carbon" = 1, "sugar" = 1) - result_amount = 3 - -/datum/chemical_reaction/anti_toxin - name = "Anti-Toxin (Dylovene)" - id = "anti_toxin" - result = "anti_toxin" - required_reagents = list("silicon" = 1, "potassium" = 1, "nitrogen" = 1) + required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1) result_amount = 3 /datum/chemical_reaction/mutagen @@ -142,20 +128,6 @@ silicate required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1) result_amount = 3 -/datum/chemical_reaction/hyronalin - name = "Hyronalin" - id = "hyronalin" - result = "hyronalin" - required_reagents = list("radium" = 1, "anti_toxin" = 1) - result_amount = 2 - -/datum/chemical_reaction/arithrazine - name = "Arithrazine" - id = "arithrazine" - result = "arithrazine" - required_reagents = list("hyronalin" = 1, "hydrogen" = 1) - result_amount = 2 - /datum/chemical_reaction/impedrezene name = "Impedrezene" id = "impedrezene" @@ -163,13 +135,6 @@ silicate required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1) result_amount = 2 -/datum/chemical_reaction/kelotane - name = "Kelotane" - id = "kelotane" - result = "kelotane" - required_reagents = list("silicon" = 1, "carbon" = 1) - result_amount = 2 - /datum/chemical_reaction/leporazine name = "Leporazine" id = "leporazine" @@ -185,68 +150,25 @@ silicate required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1) result_amount = 3 -/datum/chemical_reaction/tricordrazine - name = "Tricordrazine" - id = "tricordrazine" - result = "tricordrazine" - required_reagents = list("inaprovaline" = 1, "anti_toxin" = 1) - result_amount = 2 - /datum/chemical_reaction/alkysine name = "Alkysine" id = "alkysine" result = "alkysine" - required_reagents = list("chlorine" = 1, "nitrogen" = 1, "anti_toxin" = 1) + required_reagents = list("chlorine" = 1, "nitrogen" = 1, "charcoal" = 1) result_amount = 2 -/datum/chemical_reaction/dexalin - name = "Dexalin" - id = "dexalin" - result = "dexalin" - required_reagents = list("oxygen" = 2) - required_catalysts = list("plasma" = 5) - result_amount = 1 - -/datum/chemical_reaction/dermaline - name = "Dermaline" - id = "dermaline" - result = "dermaline" - required_reagents = list("oxygen" = 1, "phosphorus" = 1, "kelotane" = 1) - result_amount = 3 - -/datum/chemical_reaction/dexalinp - name = "Dexalin Plus" - id = "dexalinp" - result = "dexalinp" - required_reagents = list("dexalin" = 1, "carbon" = 1, "iron" = 1) - result_amount = 3 - -/datum/chemical_reaction/bicaridine - name = "Bicaridine" - id = "bicaridine" - result = "bicaridine" - required_reagents = list("inaprovaline" = 1, "carbon" = 1) - result_amount = 2 - -/datum/chemical_reaction/hyperzine - name = "Hyperzine" - id = "hyperzine" - result = "hyperzine" - required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,) - result_amount = 3 - /datum/chemical_reaction/ryetalyn name = "Ryetalyn" id = "ryetalyn" result = "ryetalyn" - required_reagents = list("arithrazine" = 1, "carbon" = 1) + required_reagents = list("pen_acid" = 1, "carbon" = 1) result_amount = 2 /datum/chemical_reaction/cryoxadone name = "Cryoxadone" id = "cryoxadone" result = "cryoxadone" - required_reagents = list("dexalin" = 1, "water" = 1, "oxygen" = 1) + required_reagents = list("salbutamol" = 1, "water" = 1, "oxygen" = 1) result_amount = 3 /datum/chemical_reaction/clonexadone @@ -261,28 +183,21 @@ silicate name = "Spaceacillin" id = "spaceacillin" result = "spaceacillin" - required_reagents = list("cryptobiolin" = 1, "inaprovaline" = 1) - result_amount = 2 - -/datum/chemical_reaction/imidazoline - name = "imidazoline" - id = "imidazoline" - result = "imidazoline" - required_reagents = list("carbon" = 1, "hydrogen" = 1, "anti_toxin" = 1) + required_reagents = list("cryptobiolin" = 1, "ephedrine" = 1) result_amount = 2 /datum/chemical_reaction/inacusiate name = "inacusiate" id = "inacusiate" result = "inacusiate" - required_reagents = list("water" = 1, "carbon" = 1, "anti_toxin" = 1) + required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1) result_amount = 2 /datum/chemical_reaction/ethylredoxrazine name = "Ethylredoxrazine" id = "ethylredoxrazine" result = "ethylredoxrazine" - required_reagents = list("oxygen" = 1, "anti_toxin" = 1, "carbon" = 1) + required_reagents = list("oxygen" = 1, "charcoal" = 1, "carbon" = 1) result_amount = 3 /datum/chemical_reaction/ethanoloxidation @@ -437,7 +352,7 @@ silicate name = "Mindbreaker Toxin" id = "mindbreaker" result = "mindbreaker" - required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1) + required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1) result_amount = 5 /datum/chemical_reaction/lipozine @@ -964,9 +879,9 @@ datum/chemical_reaction/pestkiller S.loc = get_turf(holder.my_atom) /datum/chemical_reaction/slimeinaprov - name = "Slime Inaprovaline" + name = "Slime ephedrine" id = "m_inaprov" - result = "inaprovaline" + result = "ephedrine" required_reagents = list("water" = 5) result_amount = 3 required_other = 1 diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index b4a3825e249..c75885228a7 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -23,8 +23,8 @@ Borg Hypospray var/recharge_time = 5 //Time it takes for shots to recharge (in seconds) var/list/datum/reagents/reagent_list = list() - var/list/reagent_ids = list("doctorsdelight", "inaprovaline", "spaceacillin") - //var/list/reagent_ids = list("dexalin", "kelotane", "bicaridine", "anti_toxin", "inaprovaline", "spaceacillin") + var/list/reagent_ids = list("doctorsdelight", "ephedrine", "spaceacillin") + //var/list/reagent_ids = list("salbutamol", "salglu_solution", "salglu_solution", "charcoal", "ephedrine", "spaceacillin") var/list/modes = list() //Basically the inverse of reagent_ids. Instead of having numbers as "keys" and strings as values it has strings as keys and numbers as values. //Used as list for input() in shakers. diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 3092bd960dc..0309bf9281b 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -24,11 +24,11 @@ reagents.add_reagent("[spawned_reagent]", spawned_amount) -/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline - name = "inaprovaline bottle" - desc = "A small bottle. Contains inaprovaline - used to stabilize patients." +/obj/item/weapon/reagent_containers/glass/bottle/ephedrine + name = "ephedrine bottle" + desc = "A small bottle. Contains ephedrine - used to stabilize patients." icon_state = "bottle16" - spawned_reagent = "inaprovaline" + spawned_reagent = "ephedrine" /obj/item/weapon/reagent_containers/glass/bottle/toxin name = "toxin bottle" @@ -62,11 +62,11 @@ spawned_reagent = "chloralhydrate" spawned_amount = 15 -/obj/item/weapon/reagent_containers/glass/bottle/antitoxin - name = "anti-toxin bottle" - desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug." +/obj/item/weapon/reagent_containers/glass/bottle/charcoal + name = "charcoal bottle" + desc = "A small bottle of charcoal." icon_state = "bottle17" - spawned_reagent = "anti_toxin" + spawned_reagent = "salglu_solution" /obj/item/weapon/reagent_containers/glass/bottle/mutagen name = "unstable mutagen bottle" diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9dd614905e5..a9e046f1898 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -42,7 +42,7 @@ /obj/item/weapon/reagent_containers/hypospray/CMO/New() ..() - reagents.add_reagent("doctorsdelight", 30) + reagents.add_reagent("omnizine", 30) /obj/item/weapon/reagent_containers/hypospray/combat name = "combat stimulant injector" @@ -54,14 +54,15 @@ /obj/item/weapon/reagent_containers/hypospray/combat/New() ..() - reagents.add_reagent("synaptizine", 30) + reagents.add_reagent("ephedrine", 15) + reagents.add_reagent("salglu_solution", 15) //MediPens /obj/item/weapon/reagent_containers/hypospray/medipen - name = "inaprovaline medipen" //lol epipen is copyrighted + name = "ephedrine medipen" desc = "A rapid and safe way to stabilize patients in critical condition for personnel without advanced medical knowledge." icon_state = "medipen" item_state = "medipen" @@ -69,7 +70,7 @@ volume = 10 ignore_flags = 1 //so you can medipen through hardsuits flags = null - var/starting_reagent = "inaprovaline" + var/starting_reagent = "ephedrine" var/starting_amount = 10 /obj/item/weapon/reagent_containers/hypospray/medipen/New() @@ -115,7 +116,7 @@ name = "stimpack medipen" desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor at the cost of some shortness of breath." icon_state = "stimpen" - starting_reagent = "hyperzine" + starting_reagent = "morphine" starting_amount = 9 /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack/New() @@ -128,10 +129,4 @@ name = "morphine medipen" desc = "A rapid way to get you out of a tight situation and fast! You'll feel rather drowsy, though." icon_state = "medipen" - starting_reagent = "morphine" - -/obj/item/weapon/reagent_containers/hypospray/medipen/ephedrine - name = "ephedrine medipen" - desc = "A rapid way to get you up and out of a tight situation and fast!" - icon_state = "medipen" - starting_reagent = "ephedrine" \ No newline at end of file + starting_reagent = "morphine" \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index dae7d54156a..08ef1efcb37 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -14,4 +14,25 @@ icon_state = "bandaid" // thanks inheritance /obj/item/weapon/reagent_containers/pill/patch/afterattack(obj/target, mob/user , proximity) - return // thanks inheritance again \ No newline at end of file + return // thanks inheritance again + +/obj/item/weapon/reagent_containers/pill/patch/canconsume(mob/eater, mob/user) + if(!eater.SpeciesCanConsume()) + return 0 + return 1 // Masks were stopping people from "eating" patches. Thanks, inheritance. + +/obj/item/weapon/reagent_containers/pill/patch/styptic + name = "styptic powder patch" + desc = "Helps with brute injuries." + +/obj/item/weapon/reagent_containers/pill/patch/styptic/New() + ..() + reagents.add_reagent("styptic_powder", 25) + +/obj/item/weapon/reagent_containers/pill/patch/silver_sulf + name = "silver sulfadiazine patch" + desc = "Helps with burn injuries." + +/obj/item/weapon/reagent_containers/pill/patch/silver_sulf/New() + ..() + reagents.add_reagent("silver_sulfadiazine", 25) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 14bf4ac5a7f..08e66173103 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -74,14 +74,6 @@ //////////////////////////////////////////////////////////////////////////////// //Pills -/obj/item/weapon/reagent_containers/pill/antitox - name = "anti-toxins pill" - desc = "Neutralizes many common toxins." - icon_state = "pill17" - -/obj/item/weapon/reagent_containers/pill/antitox/New() - ..() - reagents.add_reagent("anti_toxin", 50) /obj/item/weapon/reagent_containers/pill/tox @@ -122,57 +114,6 @@ ..() reagents.add_reagent("stoxin", 30) - -/obj/item/weapon/reagent_containers/pill/kelotane - name = "kelotane pill" - desc = "Used to treat burns." - icon_state = "pill11" - -/obj/item/weapon/reagent_containers/pill/kelotane/New() - ..() - reagents.add_reagent("kelotane", 30) - - -/obj/item/weapon/reagent_containers/pill/dermaline - name = "dermaline pill" - desc = "Used to treat severe burns." - icon_state = "pill12" - -/obj/item/weapon/reagent_containers/pill/dermaline/New() - ..() - reagents.add_reagent("dermaline", 30) - - -/obj/item/weapon/reagent_containers/pill/inaprovaline - name = "inaprovaline pill" - desc = "Used to stabilize patients." - icon_state = "pill20" - -/obj/item/weapon/reagent_containers/pill/inaprovaline/New() - ..() - reagents.add_reagent("inaprovaline", 30) - - -/obj/item/weapon/reagent_containers/pill/dexalin - name = "dexalin pill" - desc = "Used to treat oxygen deprivation." - icon_state = "pill16" - -/obj/item/weapon/reagent_containers/pill/dexalin/New() - ..() - reagents.add_reagent("dexalin", 30) - - -/obj/item/weapon/reagent_containers/pill/bicaridine - name = "bicaridine pill" - desc = "Used to treat physical injuries." - icon_state = "pill18" - -/obj/item/weapon/reagent_containers/pill/bicaridine/New() - ..() - reagents.add_reagent("bicaridine", 30) - - /obj/item/weapon/reagent_containers/pill/stimulant name = "stimulant pill" desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!" @@ -180,6 +121,33 @@ /obj/item/weapon/reagent_containers/pill/stimulant/New() ..() - reagents.add_reagent("hyperzine", 10) + reagents.add_reagent("morphine", 10) reagents.add_reagent("ethylredoxrazine", 10) - reagents.add_reagent("coffee", 30) \ No newline at end of file + reagents.add_reagent("coffee", 30) + +/obj/item/weapon/reagent_containers/pill/salbutamol + name = "salbutamol pill" + desc = "Used to treat oxygen deprivation." + icon_state = "pill18" + +/obj/item/weapon/reagent_containers/pill/salbutamol/New() + ..() + reagents.add_reagent("salbutamol", 30) + +/obj/item/weapon/reagent_containers/pill/charcoal + name = "charcoal pill" + desc = "Neutralizes many common toxins." + icon_state = "pill17" + +/obj/item/weapon/reagent_containers/pill/charcoal/New() + ..() + reagents.add_reagent("charcoal", 50) + +/obj/item/weapon/reagent_containers/pill/ephedrine + name = "ephedrine pill" + desc = "Used to stabilize patients." + icon_state = "pill17" + +/obj/item/weapon/reagent_containers/pill/ephedrine/New() + ..() + reagents.add_reagent("ephedrine", 50) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 83e0f65a320..498158f564d 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -233,21 +233,21 @@ -/obj/item/weapon/reagent_containers/syringe/inaprovaline - name = "syringe (inaprovaline)" - desc = "Contains inaprovaline - used to stabilize patients." +/obj/item/weapon/reagent_containers/syringe/ephedrine + name = "syringe (ephedrine)" + desc = "Contains ephedrine - used to stabilize patients." New() ..() - reagents.add_reagent("inaprovaline", 15) + reagents.add_reagent("ephedrine", 15) mode = SYRINGE_INJECT update_icon() -/obj/item/weapon/reagent_containers/syringe/antitoxin - name = "syringe (anti-toxin)" - desc = "Contains anti-toxins." +/obj/item/weapon/reagent_containers/syringe/charcoal + name = "syringe (charcoal)" + desc = "Contains charcoal." New() ..() - reagents.add_reagent("anti_toxin", 15) + reagents.add_reagent("charcoal", 15) mode = SYRINGE_INJECT update_icon() @@ -270,30 +270,30 @@ //Robot syringes //Not special in any way, code wise. They don't have added variables or procs. -/obj/item/weapon/reagent_containers/syringe/robot/antitoxin - name = "syringe (anti-toxin)" - desc = "Contains anti-toxins." +/obj/item/weapon/reagent_containers/syringe/robot/charcoal + name = "syringe (charcoal)" + desc = "Contains charcoal." New() ..() - reagents.add_reagent("anti_toxin", 15) + reagents.add_reagent("charcoal", 15) mode = SYRINGE_INJECT update_icon() -/obj/item/weapon/reagent_containers/syringe/robot/inoprovaline - name = "syringe (inoprovaline)" - desc = "Contains inaprovaline - used to stabilize patients." +/obj/item/weapon/reagent_containers/syringe/robot/ephedrine + name = "syringe (ephedrine)" + desc = "Contains ephedrine - used to stabilize patients." New() ..() - reagents.add_reagent("inaprovaline", 15) + reagents.add_reagent("ephedrine", 15) mode = SYRINGE_INJECT update_icon() /obj/item/weapon/reagent_containers/syringe/robot/mixed name = "syringe (mixed)" - desc = "Contains inaprovaline & anti-toxins." + desc = "Contains ephedrine & charcoal solution." New() ..() - reagents.add_reagent("inaprovaline", 7) - reagents.add_reagent("anti_toxin", 8) + reagents.add_reagent("ephedrine", 7) + reagents.add_reagent("charcoal", 8) mode = SYRINGE_INJECT update_icon()