cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors renaming things with a pen. (#14960)

Browse Source 
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
This commit is contained in:
moxian
2020-12-16 14:43:15 -05:00
committed by GitHub
parent b797f85a49
commit 1683c4271a
27 changed files with 186 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/glass_containers.dm
+3 -13
View File
@@ -107,22 +107,12 @@
/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
if(length(tmp_label) > MAX_NAME_LEN)
to_chat(user, "<span class='warning'>The label can be at most [MAX_NAME_LEN] characters long.</span>")
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
label_text = tmp_label
update_name_label()
var/t = rename_interactive(user, I)
if(!isnull(t))
label_text = t
else
return ..()
/obj/item/reagent_containers/glass/proc/update_name_label()
if(label_text == "")
name = base_name
else
name = "[base_name] ([label_text])"
/obj/item/reagent_containers/glass/beaker
name = "beaker"
desc = "A beaker. Can hold up to 50 units."
code/modules/reagents/reagent_containers/iv_bag.dm
+14 -16
View File
@@ -149,39 +149,34 @@
if(IV_INJECT)
overlays += "inject"
/obj/item/reagent_containers/iv_bag/proc/set_label(new_label)
name = "[initial(name)] ([new_label])"
/obj/item/reagent_containers/iv_bag/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text))
if(length(tmp_label) > MAX_NAME_LEN)
to_chat(user, "<span class='warning'>The label can be at most [MAX_NAME_LEN] characters long.</span>")
else
to_chat(user, "<span class='notice'>You set the label to \"[tmp_label]\".</span>")
set_label(tmp_label)
rename_interactive(user, I)
// PRE-FILLED IV BAGS BELOW
/obj/item/reagent_containers/iv_bag/salglu
name = "\improper IV Bag (Saline Glucose)"
list_reagents = list("salglu_solution" = 200)
/obj/item/reagent_containers/iv_bag/salglu/Initialize(mapload)
. = ..()
name = "[initial(name)] - Saline Glucose"
/obj/item/reagent_containers/iv_bag/blood // Don't use this - just an abstract type to allow blood bags to have a common blood_type var for ease of creation.
var/blood_type
amount_per_transfer_from_this = 5 // Bloodbags are set to transfer 5 units by default.
/obj/item/reagent_containers/iv_bag/blood/New()
..()
/obj/item/reagent_containers/iv_bag/blood/Initialize(mapload)
. = ..()
if(blood_type != null)
set_label(blood_type)
name = "[initial(name)] - [blood_type]"
reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
update_icon()
/obj/item/reagent_containers/iv_bag/blood/random/New()
/obj/item/reagent_containers/iv_bag/blood/random/Initialize()
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-")
..()
return ..()
/obj/item/reagent_containers/iv_bag/blood/APlus
blood_type = "A+"
@@ -202,5 +197,8 @@
blood_type = "O-"
/obj/item/reagent_containers/iv_bag/slime
name = "\improper IV Bag (Slime Jelly)"
list_reagents = list("slimejelly" = 200)
/obj/item/reagent_containers/iv_bag/slime/Initialize(mapload)
. = ..()
name = "[initial(name)] - Slime Jelly"