cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 17:45:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w_class

Browse Source 
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
This commit is contained in:
Mervill
2016-12-02 21:44:24 -08:00
parent 19513c398c ca6ffdba40
commit c2e2440953
95 changed files with 272 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/contract.dm
+1 -1
View File
@@ -94,7 +94,7 @@
target = nTarget
update_text()
/obj/item/weapon/paper/contract/infernal/
/obj/item/weapon/paper/contract/infernal
/obj/item/weapon/paper/contract/infernal/suicide_act(mob/user)
if(signed && (user == target.current) && istype(user,/mob/living/carbon/human/))