cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8312 from Kyep/ert_borg_fix

Browse Source 
Tweaks/Improves ERT borgs
This commit is contained in:
tigercat2000
2017-11-26 12:37:55 -08:00
committed by GitHub
parent 948496ddd0 e5db535056
commit 853fe2e73c
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/robot/robot_upgrades.dm
+7
View File
@@ -68,6 +68,9 @@
/obj/item/borg/upgrade/rename/action(var/mob/living/silicon/robot/R)
if(..())
return
if(!R.allow_rename)
to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>");
return 0
R.notify_ai(3, R.name, heldname)
R.name = heldname
R.custom_name = heldname
@@ -215,6 +218,10 @@
if(R.emagged)
return
if(R.weapons_unlock)
to_chat(R, "<span class='warning'>Internal diagnostic error: incompatible upgrade module detected.</span>");
return
R.emagged = 1
return 1