cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13658 from Heroman3003/stackruntime

Browse Source 
fixes runtime with stack dna transfer
This commit is contained in:
Casey
2022-09-04 17:50:17 -04:00
committed by CHOMPStation2
parent 43928fcfb6
commit 8a0aef53f8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/objects/items/stacks/stack.dm
View File

@@ -333,7 +333,10 @@
if (prob(transfer/orig_amount * 100)) if (prob(transfer/orig_amount * 100))
transfer_fingerprints_to(S) transfer_fingerprints_to(S)
if(blood_DNA) if(blood_DNA)
S.blood_DNA |= blood_DNA if(S.blood_DNA)
S.blood_DNA |= blood_DNA
else
S.blood_DNA = blood_DNA.Copy()
return transfer return transfer
return 0 return 0

6
code/game/objects/items/weapons/material/whetstone.dm
View File

@@ -9,7 +9,7 @@
w_class = ITEMSIZE_SMALL w_class = ITEMSIZE_SMALL
var/repair_amount = 5 var/repair_amount = 5
var/repair_time = 40 var/repair_time = 40
/obj/item/weapon/whetstone/attackby(obj/item/I, mob/user) /obj/item/weapon/whetstone/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/stack/material)) if(istype(I, /obj/item/stack/material))
var/obj/item/stack/material/M = I var/obj/item/stack/material/M = I
@@ -43,7 +43,7 @@
. = ..() . = ..()
. += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use." . += "There [uses == 1 ? "is" : "are"] [uses] [material] [uses == 1 ? src.material.sheet_singular_name : src.material.sheet_plural_name] left for use."
/obj/item/weapon/material/sharpeningkit/Initialize() /obj/item/weapon/material/sharpeningkit/New()
. = ..() . = ..()
setrepair() setrepair()
@@ -74,4 +74,4 @@
to_chat(user, "There's not enough spare sheets to sharpen [M]. You need [M.w_class*2] [M.material.sheet_plural_name].") to_chat(user, "There's not enough spare sheets to sharpen [M]. You need [M.w_class*2] [M.material.sheet_plural_name].")
return return
else else
to_chat(user, "You can't sharpen [W] with [src]!") to_chat(user, "You can't sharpen [W] with [src]!")