Replaces all var/const with #define

This commit is contained in:
AffectedArc07
2020-01-28 21:25:20 +00:00
parent 076ef673cd
commit c64bc93649
269 changed files with 1481 additions and 1474 deletions
@@ -48,14 +48,14 @@
if(safe_thing)
visible_message("<span class='danger'>[user] tries to drip something into [H]'s eyes, but fails!</span>")
reagents.reaction(safe_thing, TOUCH)
reagents.reaction(safe_thing, REAGENT_TOUCH)
to_transfer = reagents.remove_any(amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You transfer [to_transfer] units of the solution.</span>")
return
visible_message("<span class='danger'>[user] drips something into [C]'s eyes!</span>")
reagents.reaction(C, TOUCH)
reagents.reaction(C, REAGENT_TOUCH)
var/list/injected = list()
for(var/datum/reagent/R in reagents.reagent_list)
@@ -137,7 +137,7 @@
var/str = english_list(virList)
add_attack_logs(user, M, "Infected with [str].")
reagents.reaction(M, INGEST, reagents.total_volume)
reagents.reaction(M, REAGENT_INGEST, reagents.total_volume)
reagents.trans_to(M, 1)
var/contained = english_list(injected)
@@ -79,7 +79,7 @@
else
M.LAssailant = user
reagents.reaction(M, TOUCH)
reagents.reaction(M, REAGENT_TOUCH)
reagents.clear_reagents()
else
if(M != user)
@@ -95,7 +95,7 @@
to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
var/fraction = min(5 / reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
reagents.reaction(M, REAGENT_INGEST, fraction)
addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
else
@@ -146,7 +146,7 @@
else if(reagents.total_volume && user.a_intent == INTENT_HARM)
user.visible_message("<span class='danger'>[user] splashes the contents of [src] onto [target]!</span>", \
"<span class='notice'>You splash the contents of [src] onto [target].</span>")
reagents.reaction(target, TOUCH)
reagents.reaction(target, REAGENT_TOUCH)
reagents.clear_reagents()
/obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params)
@@ -361,7 +361,7 @@
..()
if(slot == slot_head && reagents.total_volume)
to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
reagents.reaction(user, TOUCH)
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
/obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params)
@@ -68,7 +68,7 @@
if(mode) // Injecting
if(reagents.total_volume)
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //The amount of reagents we'll transfer to the person
reagents.reaction(injection_target, INGEST, fraction) //React the amount we're transfering.
reagents.reaction(injection_target, REAGENT_INGEST, fraction) //React the amount we're transfering.
reagents.trans_to(injection_target, amount_per_transfer_from_this)
update_icon()
else // Drawing
@@ -6,7 +6,7 @@
item_state = "bandaid"
possible_transfer_amounts = null
volume = 40
apply_type = TOUCH
apply_type = REAGENT_TOUCH
apply_method = "apply"
transfer_efficiency = 0.5 //patches aren't as effective at getting chemicals into the bloodstream.
@@ -138,7 +138,7 @@
add_attack_logs(user, L, "Injected with [name] containing [contained], transfered [amount_per_transfer_from_this] units", reagents.harmless_helper() ? ATKLOG_ALMOSTALL : null)
var/fraction = min(amount_per_transfer_from_this / reagents.total_volume, 1)
reagents.reaction(L, INGEST, fraction)
reagents.reaction(L, REAGENT_INGEST, fraction)
reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "<span class='notice'>You inject [amount_per_transfer_from_this] units of the solution. The syringe now contains [reagents.total_volume] units.</span>")
if(reagents.total_volume <= 0 && mode == SYRINGE_INJECT)