cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into findnreplace

Browse Source
This commit is contained in:
Mark van Alphen
2017-03-05 12:09:52 +00:00
committed by GitHub
parent 58ae83724c 74931d3934
commit b0ded4b821
246 changed files with 11152 additions and 5727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+1
View File
@@ -40,6 +40,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("egg" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/rice = list("rice" = -5),
//Grinder stuff, but only if dry
/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
code/modules/reagents/chemistry/reagents/misc.dm
-1
View File
@@ -39,7 +39,6 @@
reagent_state = GAS
color = "#808080" // rgb: 128, 128, 128
/datum/reagent/nitrogen
name = "Nitrogen"
id = "nitrogen"
code/modules/reagents/reagent_containers/blood_pack.dm
+31
View File
@@ -1,11 +1,13 @@
/obj/item/weapon/reagent_containers/blood
name = "BloodPack"
var/base_name = "BloodPack"
desc = "Contains blood used for transfusion."
icon = 'icons/obj/bloodpack.dmi'
icon_state = "empty"
volume = 200
var/blood_type = null
var/label_text = ""
/obj/item/weapon/reagent_containers/blood/New()
..()
@@ -16,6 +18,7 @@
/obj/item/weapon/reagent_containers/blood/on_reagent_change()
update_icon()
update_name_label()
/obj/item/weapon/reagent_containers/blood/update_icon()
var/percent = round((reagents.total_volume / volume) * 100)
@@ -27,27 +30,55 @@
if(51 to INFINITY)
icon_state = "full"
/obj/item/weapon/reagent_containers/blood/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/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()
/obj/item/weapon/reagent_containers/blood/proc/update_name_label()
if(reagents.total_volume == 0)
base_name = "Empty BloodPack"
desc = "Seems pretty useless... Maybe if there were a way to fill it?"
else
base_name = "BloodPack"
desc = "Contains blood used for transfusion."
if(label_text == "")
name = base_name
else
name = "[base_name] ([label_text])"
/obj/item/weapon/reagent_containers/blood/random/New()
blood_type = pick("A+", "A-", "B+", "B-", "O+", "O-")
..()
/obj/item/weapon/reagent_containers/blood/APlus
blood_type = "A+"
label_text = "A+"
/obj/item/weapon/reagent_containers/blood/AMinus
blood_type = "A-"
label_text = "A-"
/obj/item/weapon/reagent_containers/blood/BPlus
blood_type = "B+"
label_text = "B+"
/obj/item/weapon/reagent_containers/blood/BMinus
blood_type = "B-"
label_text = "B-"
/obj/item/weapon/reagent_containers/blood/OPlus
blood_type = "O+"
label_text = "O+"
/obj/item/weapon/reagent_containers/blood/OMinus
blood_type = "O-"
label_text = "O-"
/obj/item/weapon/reagent_containers/blood/empty
name = "Empty BloodPack"