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

Merge pull request #9814 from VOREStation/upstream-merge-7820

Browse Source 
[MIRROR] Adds the Restraining Bolt.
This commit is contained in:
Novacat
2021-02-28 18:16:22 -05:00
committed by Chompstation Bot
parent 553c26bde2
commit 7f7c5873d6
13 changed files with 161 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/organs/internal/augment.dm
View File

@@ -64,6 +64,10 @@
else
return
if(robotic && owner.get_restraining_bolt())
to_chat(owner, "<span class='warning'>\The [src] doesn't respond.</span>")
return
var/item_to_equip = integrated_object
if(!item_to_equip && integrated_object_type)
item_to_equip = integrated_object_type

2
code/modules/organs/internal/augment/armmounted.dm
View File

@@ -143,7 +143,7 @@
if(istype(owner, /mob/living/carbon/human))
var/mob/living/carbon/human/H = owner
H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES)
/obj/item/organ/internal/augment/armmounted/shoulder/blade
name = "armblade implant"
desc = "A large implant that fits into a subject's arm. It deploys a large metal blade by some painful means."