diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 1c44b24f45ed..f9484a898edd 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -791,7 +791,6 @@ var/datum/subsystem/garbage_collector/SSgarbage SearchVar(brass_recipes) SearchVar(disposalpipeID2State) SearchVar(RPD_recipes) - SearchVar(highlander_claymores) SearchVar(biblenames) SearchVar(biblestates) SearchVar(bibleitemstates) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 46e279f75ae1..cff4bdd76c87 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -65,12 +65,12 @@ user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") return(BRUTELOSS) -var/highlander_claymores = 0 /obj/item/weapon/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." flags = CONDUCT | NODROP | DROPDEL slot_flags = null block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY + luminosity = 3 attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE var/obj/item/weapon/disk/nuclear/nuke_disk //OUR STORED NUKE DISK @@ -78,20 +78,33 @@ var/highlander_claymores = 0 /obj/item/weapon/claymore/highlander/New() ..() START_PROCESSING(SSobj, src) - highlander_claymores++ /obj/item/weapon/claymore/highlander/Destroy() - STOP_PROCESSING(SSobj, src) - highlander_claymores-- if(nuke_disk) nuke_disk.forceMove(get_turf(src)) nuke_disk.visible_message("The nuke disk is vulnerable!") nuke_disk = null + STOP_PROCESSING(SSobj, src) return ..() +/obj/item/weapon/claymore/highlander/process() + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) + H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS + else + if(!admin_spawned) + qdel(src) + + /obj/item/weapon/claymore/highlander/pickup(mob/living/user) user << "The power of Scotland protects you! You are shielded from all stuns and knockdowns." user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") + user.status_flags += IGNORESLOWDOWN + +/obj/item/weapon/claymore/highlander/dropped(mob/living/user) + user.status_flags -= IGNORESLOWDOWN + qdel(src) //If this ever happens, it's because you lost an arm /obj/item/weapon/claymore/highlander/examine(mob/user) ..() diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index b16d566d82e6..778a78525d65 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -63,7 +63,7 @@ /obj/structure/chair/proc/handle_layer() if(has_buckled_mobs() && dir == NORTH) - layer = ABOVE_ALL_MOB_LAYER + layer = ABOVE_MOB_LAYER else layer = OBJ_LAYER diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 4fbd792b90f7..334a74a7861d 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -56,6 +56,7 @@ Summon Magic
Summon Events (Toggle)
There can only be one!
+ There can only be one! (40-second delay)
There can only be me!
Make all players retarded
Egalitarian Station Mode
@@ -529,8 +530,17 @@ feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","OO") usr.client.only_one() + send_to_playing_players('sound/misc/highlander.ogg') // message_admins("[key_name_admin(usr)] has triggered a battle to the death (only one)") + if("delayed_onlyone") + if(!check_rights(R_FUN)) + return + feedback_inc("admin_secrets_fun_used",1) + feedback_add_details("admin_secrets_fun_used","OO") + usr.client.only_one_delayed() + send_to_playing_players('sound/misc/highlander_delayed.ogg') + if("onlyme") if(!check_rights(R_FUN)) return diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 9a332042e8d0..9309139efd09 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -5,8 +5,7 @@ var/highlander = FALSE return highlander = TRUE - world << "THERE CAN BE ONLY ONE!!!" - world << sound('sound/misc/highlander.ogg') + send_to_playing_players("THERE CAN BE ONLY ONE") for(var/obj/item/weapon/disk/nuclear/N in poi_list) N.relocate() //Gets it out of bags and such @@ -20,6 +19,12 @@ var/highlander = FALSE log_admin("[key_name(usr)] used THERE CAN BE ONLY ONE.") addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 1), 50) +/client/proc/only_one_delayed() + send_to_playing_players("Bagpipes begin to blare. You feel Scottish pride coming over you.") + message_admins("[key_name_admin(usr)] used (delayed) THERE CAN BE ONLY ONE!") + log_admin("[key_name(usr)] used delayed THERE CAN BE ONLY ONE.") + addtimer(CALLBACK(src, .proc/only_one), 420) + /mob/living/carbon/human/proc/make_scottish() ticker.mode.traitors += mind mind.special_role = "highlander" @@ -70,7 +75,7 @@ var/highlander = FALSE antiwelder.icon_state = "bloodhand_right" put_in_hands(antiwelder) - src << "Your [H1.name] cries out for blood. Join in the slaughter, lest you be claimed yourself...\n\ + src << "Your [H1.name] cries out for blood. Claim the lives of others, and your own will be restored!\n\ Activate it in your hand, and it will lead to the nearest target. Attack the nuclear authentication disk with it, and you will store it." /proc/only_me() diff --git a/sound/misc/highlander_delayed.ogg b/sound/misc/highlander_delayed.ogg new file mode 100644 index 000000000000..d1cce707811e Binary files /dev/null and b/sound/misc/highlander_delayed.ogg differ