mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-15 00:53:23 +01:00
Extra Freeze features- Prevent direct touching and pulling
This commit is contained in:
@@ -59,11 +59,11 @@ var/list/admin_verbs_admin = list(
|
||||
/client/proc/toggledrones,
|
||||
/client/proc/man_up,
|
||||
/client/proc/global_man_up,
|
||||
/client/proc/delbook,
|
||||
/client/proc/delbook,
|
||||
/client/proc/empty_ai_core_toggle_latejoin,
|
||||
/client/proc/freeze,
|
||||
/client/proc/freezemecha
|
||||
|
||||
|
||||
)
|
||||
var/list/admin_verbs_ban = list(
|
||||
/client/proc/unban_panel,
|
||||
|
||||
@@ -38,8 +38,35 @@
|
||||
message_admins("\blue [key_name_admin(usr)] unfroze [key_name(M)]")
|
||||
log_admin("[key_name(usr)] unfroze [key_name(M)]")
|
||||
M.revive()
|
||||
else if (istype(M, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/FM = M
|
||||
|
||||
if(!FM.paralysis)
|
||||
FM.anchored = 1
|
||||
FM.frozen = 1
|
||||
FM.AdjustParalysis(2147483647)
|
||||
var/adminomaly = new/obj/effect/overlay/adminoverlay
|
||||
spawn(50)
|
||||
FM.overlays += adminomaly
|
||||
FM << "<b><font color= red>You have been frozen by <a href='?priv_msg=\ref[usr.client]'>[key]</a></b></font>"
|
||||
message_admins("\blue [key_name_admin(usr)] froze [key_name(FM)]")
|
||||
log_admin("[key_name(usr)] froze [key_name(FM)]")
|
||||
else if (M.paralysis)
|
||||
FM.anchored = 0
|
||||
FM.frozen = 0
|
||||
FM.AdjustParalysis(-2147483647)
|
||||
FM.blinded = 0
|
||||
FM.lying = 0
|
||||
FM.stat = 0
|
||||
|
||||
FM << "<b> <font color= red>You have been unfrozen by <a href='?priv_msg=\ref[usr.client]'>[key]</a></b></font>"
|
||||
message_admins("\blue [key_name_admin(usr)] unfroze [key_name(FM)]")
|
||||
log_admin("[key_name(usr)] unfroze [key_name(FM)]")
|
||||
|
||||
else
|
||||
|
||||
if(!M.paralysis)
|
||||
M.anchored = 1
|
||||
M.AdjustParalysis(2147483647)
|
||||
var/adminomaly = new/obj/effect/overlay/adminoverlay
|
||||
spawn(50)
|
||||
@@ -48,6 +75,7 @@
|
||||
message_admins("\blue [key_name_admin(usr)] froze [key_name(M)]")
|
||||
log_admin("[key_name(usr)] froze [key_name(M)]")
|
||||
else if (M.paralysis)
|
||||
M.anchored = 0
|
||||
M.AdjustParalysis(-2147483647)
|
||||
M.blinded = 0
|
||||
M.lying = 0
|
||||
|
||||
@@ -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