From d8f84ca96649c0534afc90634005fe09a26abdf1 Mon Sep 17 00:00:00 2001 From: coiax Date: Mon, 14 Jan 2019 22:32:40 +0000 Subject: [PATCH] Desc/iconifies various pills, admin floorpill bottles (#42229) * Renames aranesp, desc/iconifies various pills, admin floorpill bottles * Unrenames --- code/game/objects/items/storage/firstaid.dm | 22 +++++- .../chemistry/reagents/drug_reagents.dm | 2 +- .../reagents/reagent_containers/pill.dm | 73 ++++++++++++------- 3 files changed, 66 insertions(+), 31 deletions(-) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index bc3260b8c08..e8d3e83b871 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -266,7 +266,7 @@ /obj/item/storage/pill_bottle/lsd name = "suspicious pill bottle" - desc = "There is a badly drawn thing with the shape of a mushroom." + desc = "There is a crude drawing which could be either a mushroom, or a deformed moon." /obj/item/storage/pill_bottle/lsd/PopulateContents() for(var/i in 1 to 5) @@ -274,7 +274,7 @@ /obj/item/storage/pill_bottle/aranesp name = "suspicious pill bottle" - desc = "The label says 'gotta go fast'." + desc = "The label has 'fuck disablers' hastily scrawled in black marker." /obj/item/storage/pill_bottle/aranesp/PopulateContents() for(var/i in 1 to 5) @@ -304,6 +304,7 @@ for(var/i in 1 to 3) new /obj/item/reagent_containers/pill/penacid(src) + /obj/item/storage/pill_bottle/neurine name = "bottle of neurine pills" desc = "Contains pills to treat non-severe mental traumas." @@ -311,3 +312,20 @@ /obj/item/storage/pill_bottle/neurine/PopulateContents() for(var/i in 1 to 5) new /obj/item/reagent_containers/pill/neurine(src) + +/obj/item/storage/pill_bottle/floorpill + name = "bottle of floorpills" + desc = "An old pill bottle. It smells musty." + +/obj/item/storage/pill_bottle/floorpill/Initialize() + . = ..() + var/obj/item/reagent_containers/pill/P = locate() in src + name = "bottle of [P.name]s" + +/obj/item/storage/pill_bottle/floorpill/PopulateContents() + for(var/i in 1 to rand(1,7)) + new /obj/item/reagent_containers/pill/floorpill(src) + +/obj/item/storage/pill_bottle/floorpill/full/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/reagent_containers/pill/floorpill(src) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index 2056b26c291..5d38bf25d4a 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -354,7 +354,7 @@ /datum/reagent/drug/aranesp name = "Aranesp" id = "aranesp" - description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage." + description = "Amps you up, gets you going, and rapidly restores stamina damage. Side effects include breathlessness and toxicity." reagent_state = LIQUID color = "#78FFF0" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index a7b15c6498d..335e8e87c02 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -11,7 +11,7 @@ grind_results = list() var/apply_type = INGEST var/apply_method = "swallow" - var/roundstart = FALSE + var/rename_with_volume = FALSE var/self_delay = 0 //pills are instant, this is because patches inheret their aplication from pills var/dissolvable = TRUE @@ -19,7 +19,7 @@ . = ..() if(!icon_state) icon_state = "pill[rand(1,20)]" - if(reagents.total_volume && roundstart) + if(reagents.total_volume && rename_with_volume) name += " ([reagents.total_volume]u)" @@ -83,94 +83,110 @@ desc = "Highly toxic." icon_state = "pill5" list_reagents = list("toxin" = 50) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/cyanide name = "cyanide pill" desc = "Don't swallow this." icon_state = "pill5" list_reagents = list("cyanide" = 50) - roundstart = TRUE + /obj/item/reagent_containers/pill/adminordrazine name = "adminordrazine pill" desc = "It's magic. We don't have to explain it." icon_state = "pill16" list_reagents = list("adminordrazine" = 50) - roundstart = TRUE + /obj/item/reagent_containers/pill/morphine name = "morphine pill" desc = "Commonly used to treat insomnia." icon_state = "pill8" list_reagents = list("morphine" = 30) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/stimulant name = "stimulant pill" desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!" icon_state = "pill19" list_reagents = list("ephedrine" = 10, "antihol" = 10, "coffee" = 30) - roundstart = TRUE + /obj/item/reagent_containers/pill/salbutamol name = "salbutamol pill" desc = "Used to treat oxygen deprivation." icon_state = "pill16" list_reagents = list("salbutamol" = 30) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/charcoal name = "charcoal pill" desc = "Neutralizes many common toxins." icon_state = "pill17" list_reagents = list("charcoal" = 10) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/epinephrine name = "epinephrine pill" desc = "Used to stabilize patients." icon_state = "pill5" list_reagents = list("epinephrine" = 15) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/mannitol name = "mannitol pill" desc = "Used to treat brain damage." icon_state = "pill17" list_reagents = list("mannitol" = 50) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/mutadone name = "mutadone pill" desc = "Used to treat genetic damage." icon_state = "pill20" list_reagents = list("mutadone" = 50) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/salicyclic name = "salicylic acid pill" desc = "Used to dull pain." icon_state = "pill9" list_reagents = list("sal_acid" = 24) - roundstart = TRUE + rename_with_volume = TRUE + /obj/item/reagent_containers/pill/oxandrolone name = "oxandrolone pill" desc = "Used to stimulate burn healing." icon_state = "pill11" list_reagents = list("oxandrolone" = 24) - roundstart = TRUE + rename_with_volume = TRUE /obj/item/reagent_containers/pill/insulin name = "insulin pill" desc = "Handles hyperglycaemic coma." icon_state = "pill18" list_reagents = list("insulin" = 50) - roundstart = TRUE + rename_with_volume = TRUE /obj/item/reagent_containers/pill/psicodine name = "psicodine pill" desc = "Used to treat mental instability and phobias." list_reagents = list("psicodine" = 10) icon_state = "pill22" - roundstart = TRUE + rename_with_volume = TRUE /obj/item/reagent_containers/pill/penacid name = "pentetic acid pill" desc = "Used to expunge radioation and toxins." list_reagents = list("pen_acid" = 10) icon_state = "pill22" - roundstart = TRUE + rename_with_volume = TRUE + +/obj/item/reagent_containers/pill/neurine + name = "neurine pill" + desc = "Used to treat non-severe mental traumas." + list_reagents = list("neurine" = 10) + icon_state = "pill22" + rename_with_volume = TRUE + ///////////////////////////////////////// this pill is used only in a legion mob drop /obj/item/reagent_containers/pill/shadowtoxin name = "black pill" @@ -178,25 +194,34 @@ icon_state = "pill9" color = "#454545" list_reagents = list("shadowmutationtoxin" = 1) + //////////////////////////////////////// drugs /obj/item/reagent_containers/pill/zoom - name = "zoom pill" + name = "yellow pill" + desc = "A poorly made canary-yellow pill; it is slightly crumbly." list_reagents = list("synaptizine" = 10, "nicotine" = 10, "methamphetamine" = 1) + icon_state = "pill7" /obj/item/reagent_containers/pill/happy name = "happy pill" + desc = "They have little happy faces on them, and they smell like marker pens." list_reagents = list("sugar" = 10, "space_drugs" = 10) + icon_state = "pill_happy" /obj/item/reagent_containers/pill/lsd - name = "hallucinogen pill" + name = "sunshine pill" + desc = "Engraved on this split-coloured pill is a half-sun, half-moon." list_reagents = list("mushroomhallucinogen" = 15, "mindbreaker" = 15) + icon_state = "pill14" /obj/item/reagent_containers/pill/aranesp - name = "speedy pill" + name = "smooth pill" + desc = "This blue pill is feels slightly moist." list_reagents = list("aranesp" = 10) + icon_state = "pill3" /obj/item/reagent_containers/pill/happiness name = "happiness pill" @@ -204,14 +229,6 @@ icon_state = "pill_happy" list_reagents = list("happiness" = 10) -/obj/item/reagent_containers/pill/neurine - name = "neurine pill" - desc = "Used to treat non-severe mental traumas." - list_reagents = list("neurine" = 10) - icon_state = "pill22" - roundstart = TRUE - - /obj/item/reagent_containers/pill/floorpill name = "floorpill" desc = "A strange pill found in the depths of maintenance"