cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts bloody_hands_mob to a weakref. (#10659)

Browse Source
This commit is contained in:
MarinaGryphon
2020-11-30 08:44:19 +01:00
committed by GitHub
parent 7d776d50ca
commit b8013fca16
4 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/forensics.dm
+4 -4
View File
@@ -13,11 +13,11 @@ atom/var/list/suit_fibers
atom/proc/add_fibers(mob/living/carbon/human/M)
if(M.gloves && istype(M.gloves,/obj/item/clothing/gloves))
var/obj/item/clothing/gloves/G = M.gloves
if(G.transfer_blood) //bloodied gloves transfer blood to touched objects
if(add_blood(G.bloody_hands_mob)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
if(G.transfer_blood && G.bloody_hands_mob?.resolve()) //bloodied gloves transfer blood to touched objects
if(add_blood(G.bloody_hands_mob.resolve())) //only reduces the bloodiness of our gloves if the item wasn't already bloody
G.transfer_blood--
else if(M.bloody_hands)
if(add_blood(M.bloody_hands_mob))
else if(M.bloody_hands && M.bloody_hands_mob?.resolve())
if(add_blood(M.bloody_hands_mob.resolve()))
M.bloody_hands--
if(!suit_fibers) suit_fibers = list()
code/modules/detectivework/tools/rag.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/mob
var/bloody_hands = null
var/mob/living/carbon/human/bloody_hands_mob
var/datum/weakref/bloody_hands_mob
var/track_footprint = 0
var/list/feet_blood_DNA
var/track_footprint_type
@@ -8,7 +8,7 @@
/obj/item/clothing/gloves
var/transfer_blood = 0
var/mob/living/carbon/human/bloody_hands_mob
var/datum/weakref/bloody_hands_mob
/obj/item/clothing/shoes/
var/track_footprint = 0