shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

Browse Source
This commit is contained in:
Poojawa
2019-09-13 12:58:02 -05:00
parent 2bf4d00d29 b2cde8e121
commit 53895106dc
966 changed files with 9385 additions and 2942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/organs/augments_arms.dm
+6 -5
View File
@@ -185,11 +185,12 @@
zone = BODY_ZONE_L_ARM
/obj/item/organ/cyberimp/arm/toolset/emag_act()
if(!(locate(/obj/item/kitchen/knife/combat/cyborg) in items_list))
to_chat(usr, "<span class='notice'>You unlock [src]'s integrated knife!</span>")
items_list += new /obj/item/kitchen/knife/combat/cyborg(src)
return 1
return 0
. = ..()
if(locate(/obj/item/kitchen/knife/combat/cyborg) in items_list)
return
to_chat(usr, "<span class='notice'>You unlock [src]'s integrated knife!</span>")
items_list += new /obj/item/kitchen/knife/combat/cyborg(src)
return TRUE
/obj/item/organ/cyberimp/arm/esword
name = "arm-mounted energy blade"