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

Merge pull request #6159 from Heroman3003/youcantcatchme

Browse Source 
Allows objects to be made uncatchable
This commit is contained in:
Neerti
2019-05-09 16:39:19 -04:00
committed by VirgoBot
parent 6cceb5a3fc
commit abd1b97d10
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/mecha/equipment/weapons/weapons.dm
View File

@@ -411,6 +411,7 @@
icon_state = "missile" icon_state = "missile"
var/primed = null var/primed = null
throwforce = 15 throwforce = 15
catchable = 0
var/devastation = 0 var/devastation = 0
var/heavy_blast = 1 var/heavy_blast = 1
var/light_blast = 2 var/light_blast = 2

1
code/game/objects/objs.dm
View File

@@ -7,6 +7,7 @@
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
animate_movement = 2 animate_movement = 2
var/throwforce = 1 var/throwforce = 1
var/catchable = 1 // can it be caught on throws/flying?
var/sharp = 0 // whether this object cuts var/sharp = 0 // whether this object cuts
var/edge = 0 // whether this object is more likely to dismember var/edge = 0 // whether this object is more likely to dismember
var/pry = 0 //Used in attackby() to open doors var/pry = 0 //Used in attackby() to open doors

3
code/modules/mob/living/carbon/human/human_defense.dm
View File

@@ -477,6 +477,9 @@ emp_act
if(temp && !temp.is_usable()) if(temp && !temp.is_usable())
return FALSE // The hand isn't working in the first place return FALSE // The hand isn't working in the first place
if(!O.catchable)
return FALSE
// Alright, our hand works? Time to try the catching. // Alright, our hand works? Time to try the catching.
var/catch_chance = 90 // Default 90% catch rate var/catch_chance = 90 // Default 90% catch rate