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

Upstream oopsie-fixes

Browse Source
This commit is contained in:
cadyn
2020-08-28 13:00:42 -07:00
parent 3bc407b0d3
commit 860615c70c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/cyborg.dm
View File

@@ -68,8 +68,6 @@
W.attack_self(src) W.attack_self(src)
return return
if(A.type==/obj/structure/flora/pottedplant || A.parent_type==/obj/structure/flora/pottedplant)
return
// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents) // cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
if(A == loc || (A in loc) || (A in contents)) if(A == loc || (A in loc) || (A in contents))

3
code/game/objects/structures/flora/flora.dm
View File

@@ -233,6 +233,9 @@
. += "<span class='filter_notice'><i>You can see something in there...</i></span>" . += "<span class='filter_notice'><i>You can see something in there...</i></span>"
/obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user) /obj/structure/flora/pottedplant/attackby(obj/item/I, mob/user)
if(!issilicon(user))
break_syringe(target, user)
if(stored_item) if(stored_item)
to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>") to_chat(user, "<span class='notice'>[I] won't fit in. There already appears to be something in here...</span>")
return return

5
code/modules/reagents/reagent_containers/syringes.dm
View File

@@ -63,7 +63,7 @@
to_chat(user, "<span class='warning'>This syringe is broken!</span>") to_chat(user, "<span class='warning'>This syringe is broken!</span>")
return return
if(user.a_intent == I_HURT && ismob(target) && !isrobot(user)) if(user.a_intent == I_HURT && ismob(target))
if((CLUMSY in user.mutations) && prob(50)) if((CLUMSY in user.mutations) && prob(50))
target = user target = user
syringestab(target, user) syringestab(target, user)
@@ -298,7 +298,8 @@
var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD) var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
if(isnull(trans)) trans = 0 if(isnull(trans)) trans = 0
add_attack_logs(user,target,"Stabbed with [src.name] containing [contained], trasferred [trans] units") add_attack_logs(user,target,"Stabbed with [src.name] containing [contained], trasferred [trans] units")
break_syringe(target, user) if(!issilicon(user))
break_syringe(target, user)
/obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user) /obj/item/weapon/reagent_containers/syringe/proc/break_syringe(mob/living/carbon/target, mob/living/carbon/user)
desc += " It is broken." desc += " It is broken."