Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800

2020-06-23 03:12:49 +02:00
parent a7934f3f88 a0a4007332
commit ae053a9a08
736 changed files with 240884 additions and 242590 deletions
@@ -326,19 +326,18 @@
 				var/datum/reagent/R = addiction
 				if(C && R)
 					R.addiction_stage++
-					switch(R.addiction_stage)
-						if(1 to R.addiction_stage1_end)
-							need_mob_update += R.addiction_act_stage1(C)
-						if(R.addiction_stage1_end to R.addiction_stage2_end)
-							need_mob_update += R.addiction_act_stage2(C)
-						if(R.addiction_stage2_end to R.addiction_stage3_end)
-							need_mob_update += R.addiction_act_stage3(C)
-						if(R.addiction_stage3_end to R.addiction_stage4_end)
-							need_mob_update += R.addiction_act_stage4(C)
-						if(R.addiction_stage4_end to INFINITY)
-							remove_addiction(R)
-						else
-							SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
+					if(1 <= R.addiction_stage && R.addiction_stage <= R.addiction_stage1_end)
+						need_mob_update += R.addiction_act_stage1(C)
+					else if(R.addiction_stage1_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage2_end)
+						need_mob_update += R.addiction_act_stage2(C)
+					else if(R.addiction_stage2_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage3_end)
+						need_mob_update += R.addiction_act_stage3(C)
+					else if(R.addiction_stage3_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage4_end)
+						need_mob_update += R.addiction_act_stage4(C)
+					else if(R.addiction_stage4_end < R.addiction_stage)
+						remove_addiction(R)
+					else
+						SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose")
 		addiction_tick++
 	if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
 		C.updatehealth()
@@ -32,7 +32,7 @@
 	for (var/x in 1 to PILL_STYLE_COUNT)
 		var/list/SL = list()
 		SL["id"] = x
-		SL["htmltag"] = assets.icon_tag("pill[x]")
+		SL["htmltag"] = assets.icon_class_name("pill[x]")
 		pillStyles += list(SL)

 	. = ..()
@@ -213,6 +213,11 @@
 			for(var/datum/reagent/R in beaker.reagents.reagent_list)
 				. += "<span class='notice'>- [R.volume] units of [R.name].</span>"

+/obj/machinery/reagentgrinder/AltClick(mob/user)
+	. = ..()
+	if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		replace_beaker(user)
+
 /obj/machinery/reagentgrinder/proc/eject(mob/user)
 	for(var/i in holdingitems)
 		var/obj/item/O = i
@@ -857,3 +857,13 @@
 	taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
 	taste_description = "smokey sweetness"
 	value = REAGENT_VALUE_COMMON
+
+/datum/reagent/consumable/laughsyrup
+	name = "Laughin' Syrup"
+	description = "The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!"
+	nutriment_factor = 5 * REAGENTS_METABOLISM
+	color = "#803280"
+	taste_mult = 2
+	taste_description = "fizzy sweetness"
+	value = REAGENT_VALUE_COMMON
+	
@@ -250,7 +250,7 @@
 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
 		reac_volume = min((reac_volume / 10), G.amount)
-		new/obj/item/stack/medical/ointment(get_turf(G), reac_volume)
+		new/obj/item/stack/medical/mesh(get_turf(G), reac_volume)
 		G.use(reac_volume)

 /datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -336,7 +336,7 @@
 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
 		reac_volume = min((reac_volume / 10), G.amount)
-		new/obj/item/stack/medical/bruise_pack(get_turf(G), reac_volume)
+		new/obj/item/stack/medical/suture(get_turf(G), reac_volume)
 		G.use(reac_volume)

 /datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
@@ -1563,3 +1563,20 @@
 	M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5)
 	..()
 	. = 1
+
+/datum/reagent/medicine/liquid_wisdom
+	name = "liquid wisdom"
+	description = "the physical representation of wisdom, in liquid form"
+	taste_mult = 4
+	can_synth = FALSE
+	overdose_threshold = 30
+	value = REAGENT_VALUE_UNCOMMON // while it's 'rare', it can be milked from the wisdom cow
+
+/datum/reagent/medicine/liquid_wisdom/on_mob_life(mob/living/carbon/C) //slightly stronger mannitol, from the wisdom cow
+	C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM)
+	if(prob(20))
+		C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC)
+	if(prob(3))
+		to_chat(C, "[pick(GLOB.wisdoms)]") //give them a random wisdom
+	..()
+
@@ -2284,3 +2284,4 @@
 		S = new(T)
 	if(data["blood_DNA"])
 		S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"]))
+
@@ -8,7 +8,6 @@
 	possible_transfer_amounts = list(5,10,15,25,30)
 	volume = 30

-
 /obj/item/reagent_containers/glass/bottle/Initialize()
 	. = ..()
 	if(!icon_state)
@@ -40,7 +39,6 @@

 		. += filling

-
 /obj/item/reagent_containers/glass/bottle/epinephrine
 	name = "epinephrine bottle"
 	desc = "A small bottle. Contains epinephrine - used to stabilize patients."
@@ -228,6 +226,13 @@
 	desc = "A small bottle of atropine."
 	list_reagents = list(/datum/reagent/medicine/atropine = 30)

+/obj/item/reagent_containers/glass/bottle/zeolites
+	name = "Zeolites bottle"
+	desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items."
+	list_reagents = list(/datum/reagent/fermi/zeolites = 30)
+
+// Viro bottles
+
 /obj/item/reagent_containers/glass/bottle/romerol
 	name = "romerol bottle"
 	desc = "A small bottle of Romerol. The REAL zombie powder."
@@ -0,0 +1,51 @@
+/obj/item/reagent_containers/chem_pack
+	name = "intravenous medicine bag"
+	desc = "A plastic pressure bag, or 'chem pack', for IV administration of drugs. It is fitted with a thermosealing strip."
+	icon = 'icons/obj/bloodpack.dmi'
+	icon_state = "chempack"
+	volume = 100
+	reagent_flags = OPENCONTAINER
+	spillable = TRUE
+	obj_flags = UNIQUE_RENAME
+	resistance_flags = ACID_PROOF
+	var/sealed = FALSE
+
+/obj/item/reagent_containers/chem_pack/on_reagent_change(changetype)
+	update_icon()
+
+/obj/item/reagent_containers/chem_pack/update_icon()
+	cut_overlays()
+
+	var/v = min(round(reagents.total_volume / volume * 10), 10)
+	if(v > 0)
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "chempack1")
+		filling.icon_state = "chempack[v]"
+		filling.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(filling)
+
+/obj/item/reagent_containers/chem_pack/AltClick(mob/living/user)
+	if(user.canUseTopic(src, BE_CLOSE, NO_DEXTERY) && !sealed)
+		if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)))
+			to_chat(user, "<span class='warning'>Uh... whoops! You accidentally spill the content of the bag onto yourself.</span>")
+			SplashReagents(user)
+			return
+		else
+			DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+			ENABLE_BITFIELD(reagents.reagents_holder_flags, DRAWABLE |INJECTABLE )
+			spillable = FALSE
+			sealed = TRUE
+			to_chat(user, "<span class='notice'>You seal the bag.</span>")
+
+
+/obj/item/reagent_containers/chem_pack/examine()
+	. = ..()
+	if(sealed)
+		. += "<span class='notice'>The bag is sealed shut.</span>"
+	else
+		. += "<span class='notice'>Alt-click to seal it.</span>"
+
+
+obj/item/reagent_containers/chem_pack/attack_self(mob/user)
+	if(sealed)
+		return
+	..()
@@ -7,7 +7,7 @@
 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
 	volume = 5
 	reagent_flags = TRANSPARENT
-	custom_price = 75
+	custom_price = PRICE_CHEAP_AS_FREE

 /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
 	. = ..()
@@ -361,7 +361,7 @@
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "smallbottle"
 	item_state = "bottle"
-	custom_price = 30
+	custom_price = PRICE_CHEAP_AS_FREE
 	list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
 	custom_materials = list(/datum/material/glass=0)
 	volume = 50
@@ -96,8 +96,7 @@
 	reagent_flags = DRAWABLE
 	flags_1 = null
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/preservahyde = 3)
-	custom_price = 150
-	custom_premium_price = 300
+	custom_premium_price = PRICE_ALMOST_EXPENSIVE

 /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -25,14 +25,8 @@
 /obj/item/reagent_containers/pill/attack_self(mob/user)
 	return

-/obj/item/reagent_containers/pill/get_w_volume()
-	switch(reagents.total_volume)
-		if(0 to 9.5)
-			return 1
-		if(9.5 to 25)
-			return DEFAULT_VOLUME_TINY
-		else
-			return DEFAULT_VOLUME_SMALL
+/obj/item/reagent_containers/pill/get_w_volume() // DEFAULT_VOLUME_TINY at 25u, DEFAULT_VOLUME_SMALL at 50u
+	return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY

 /obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone)
 	if(!canconsume(M, user))
@@ -15,7 +15,7 @@
 	var/show_filling = TRUE
 	custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
 	reagent_flags = TRANSPARENT
-	custom_price = 100
+	custom_price = PRICE_CHEAP_AS_FREE

 /obj/item/reagent_containers/syringe/Initialize()
 	. = ..()