cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 01:52:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs

Browse Source 
ACTUALLY fixes problems with borgs permanently breaking their syringes and being able to put modules into potted plants, which causes unwanted fuckery.

Reverts #7560
This commit is contained in:
Rykka
2020-08-27 20:17:24 -04:00
parent d63d05acbd
commit f7fcdf2458
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@
to_chat(user, "<span class='warning'>This syringe is broken!</span>")
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))
target = user
syringestab(target, user)
@@ -298,7 +298,8 @@
var/trans = reagents.trans_to_mob(target, syringestab_amount_transferred, CHEM_BLOOD)
if(isnull(trans)) trans = 0
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)
desc += " It is broken."