floor cluwne fix

This commit is contained in:
Dip
2020-10-25 02:07:55 -03:00
parent e36d922f16
commit a6ce59ec67
4 changed files with 56 additions and 31 deletions
+1
View File
@@ -106,6 +106,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/show_tip,
/client/proc/smite,
/client/proc/spawn_floor_cluwne, // Yogs
/client/proc/spawn_random_floor_cluwne,
/client/proc/admin_away,
/client/proc/roll_dices //CIT CHANGE - Adds dice verb
))
+2 -1
View File
@@ -1273,8 +1273,9 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
new /obj/effect/temp_visual/target(get_turf(target))
if(ADMIN_PUNISHMENT_CLUWNE)
var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(get_turf(target))
FC.smite = TRUE
FC.forced = TRUE
FC.Acquire_Victim(target)
FC.current_victim = target
FC.interest = 5000;
FC.maxHealth = 5000
FC.health = 5000
+16 -4
View File
@@ -1,6 +1,6 @@
/client/proc/spawn_floor_cluwne()
set category = "Fun"
set name = "Unleash Floor Cluwne"
set name = "Unleash Targeted Floor Cluwne"
set desc = "Pick a specific target. Be warned: spawning more than one may cause issues!"
var/target
@@ -9,11 +9,23 @@
target = input("Any specific target in mind? Please note only live, non cluwned, human targets are valid.", "Target", target) as null|anything in GLOB.player_list
if(target && ishuman(target))
var/turf/T = get_turf(target)
var/mob/living/carbon/human/H = target
var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(T)
var/mob/living/simple_animal/hostile/floor_cluwne/FC = new /mob/living/simple_animal/hostile/floor_cluwne(H.loc)
FC.forced = TRUE
FC.Acquire_Victim(H)
FC.current_victim = H
log_admin("[key_name(usr)] spawned floor cluwne.")
message_admins("[key_name(usr)] spawned floor cluwne.")
deadchat_broadcast("<span class='deadsay'><b>Floor Cluwne</b> has just been spawned!</span>")
/client/proc/spawn_random_floor_cluwne()
set category = "Fun"
set name = "Unleash Random Floor Cluwne"
set desc = "Goes after a random player in your Z level. Be warned: spawning more than one may cause issues!"
if(!check_rights(R_FUN))
return
var/turf/T = get_turf(usr)
new /mob/living/simple_animal/hostile/floor_cluwne(T)
log_admin("[key_name(usr)] spawned a random target floor cluwne.")
message_admins("[key_name(usr)] spawned a random target floor cluwne.")