mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-04 14:33:10 +00:00
Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility
*Sterilizine will now reduce the germ level of all wounds on the mob on contact, proportional to the quantity sprayed *Spraybottles will now display the "<Person> sprays <otherperson> with the <spraybottle>" message when spraying on any mob
This commit is contained in:
@@ -385,6 +385,13 @@
|
||||
for(var/obj/item/I in M.contents)
|
||||
I.was_bloodied = null
|
||||
M.was_bloodied = null
|
||||
if(ishuman(M))
|
||||
var/mob/living/carbon/human/H = M
|
||||
for (var/obj/item/organ/external/E in H.organs)//For each external bodypart
|
||||
for (var/datum/wound/W in E.wounds)//We check each wound on that bodypart
|
||||
W.germ_level -= min(removed*20, W.germ_level)//Clean the wound a bit. Note we only clean wounds on the part, not the part itself.
|
||||
if (W.germ_level <= 0)
|
||||
W.disinfected = 1//The wound becomes disinfected if fully cleaned
|
||||
|
||||
/datum/reagent/sterilizine/touch_obj(var/obj/O)
|
||||
O.germ_level -= min(volume*20, O.germ_level)
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
return
|
||||
|
||||
/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
|
||||
if (A.density && proximity)
|
||||
if ((A.density || istype(A, /mob/living)) && proximity)//isHuman check allows the visible message to proc when spraying lying-down people and
|
||||
A.visible_message("[usr] sprays [A] with [src].")
|
||||
reagents.splash(A, amount_per_transfer_from_this)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user