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

Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes

Browse Source 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
This commit is contained in:
Atermonera
2020-08-27 18:45:20 -07:00
committed by VirgoBot
parent 61f7ef53c2
commit 4acd8a7a87
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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))
return // Don't try to put modules in here, you're a borg. TODO: Inventory refactor to not be ass.
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

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

@@ -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."