mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-20 11:34:19 +01:00
Extra Freeze features- Prevent direct touching and pulling
This commit is contained in:
@@ -3,6 +3,10 @@
|
||||
M << "No attacking people at spawn, you jackass."
|
||||
return
|
||||
|
||||
if(frozen)
|
||||
M << "\red Do not touch Admin-Frozen people."
|
||||
return
|
||||
|
||||
var/datum/organ/external/temp = M:organs_by_name["r_hand"]
|
||||
if (M.hand)
|
||||
temp = M:organs_by_name["l_hand"]
|
||||
|
||||
@@ -71,5 +71,7 @@
|
||||
|
||||
var/lastFart = 0 // Toxic fart cooldown.
|
||||
|
||||
var/frozen = 0 //used for preventing attacks on admin-frozen people
|
||||
|
||||
fire_dmi = 'icons/mob/OnFire.dmi'
|
||||
fire_sprite = "Standing"
|
||||
|
||||
@@ -395,6 +395,11 @@
|
||||
del(src)
|
||||
|
||||
var/message=null
|
||||
if(target.frozen)
|
||||
source << "\red Do not attempt to strip frozen people."
|
||||
return
|
||||
|
||||
|
||||
switch(place)
|
||||
if("syringe")
|
||||
message = "\red <B>[source] is trying to inject [target]!</B>"
|
||||
@@ -598,6 +603,10 @@ It can still be worn/put on as normal.
|
||||
if (LinkBlockedUnclimbable(t_loc, s_loc)) return
|
||||
if(item && source.get_active_hand() != item) return //Swapped hands / removed item from the active one
|
||||
if ((source.restrained() || source.stat)) return //Source restrained or unconscious / dead
|
||||
if(target.frozen)
|
||||
source << "\red Do not attempt to strip frozen people."
|
||||
return
|
||||
|
||||
|
||||
var/slot_to_process
|
||||
var/strip_item //this will tell us which item we will be stripping - if any.
|
||||
|
||||
Reference in New Issue
Block a user