mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #6159 from Heroman3003/youcantcatchme
Allows objects to be made uncatchable
This commit is contained in:
@@ -411,6 +411,7 @@
|
||||
icon_state = "missile"
|
||||
var/primed = null
|
||||
throwforce = 15
|
||||
catchable = 0
|
||||
var/devastation = 0
|
||||
var/heavy_blast = 1
|
||||
var/light_blast = 2
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
|
||||
animate_movement = 2
|
||||
var/throwforce = 1
|
||||
var/catchable = 1 // can it be caught on throws/flying?
|
||||
var/sharp = 0 // whether this object cuts
|
||||
var/edge = 0 // whether this object is more likely to dismember
|
||||
var/pry = 0 //Used in attackby() to open doors
|
||||
|
||||
@@ -477,6 +477,9 @@ emp_act
|
||||
if(temp && !temp.is_usable())
|
||||
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.
|
||||
var/catch_chance = 90 // Default 90% catch rate
|
||||
|
||||
|
||||
Reference in New Issue
Block a user