From 8e2c76db7c004c3d998c87448348e776322d880e Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Tue, 21 Jul 2020 16:42:59 +0100 Subject: [PATCH] two more --- code/datums/beepsky_fashion.dm | 25 ++++++++++++++++++- .../mob/living/simple_animal/bot/secbot.dm | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/code/datums/beepsky_fashion.dm b/code/datums/beepsky_fashion.dm index f8a72890b3..201ab86457 100644 --- a/code/datums/beepsky_fashion.dm +++ b/code/datums/beepsky_fashion.dm @@ -108,4 +108,27 @@ capture_two = "BOT is tying you up!" infraction = "Wevel THREAT_LEVEL infwactwion awert!!!" attack_one = "BOT shoves CRIMINAL onto a table!" - attack_two = "BOT shoves you onto a table!" \ No newline at end of file + attack_two = "BOT shoves you onto a table!" + +/datum/beepsky_fashion/cake //nothing else. it's just beepsky. with a cake on his head. + obj_icon_state = "cake" + +/datum/beepsky_fashion/captain + obj_icon_state = "captain" + name = "Captainsky" + desc = "The real captain of this station." + capture_one = "BOT is lecturing CRIMINAL on why he is the captain!" + capture_two = "BOT is lecturing you on why he is the captain!" + infraction = "Level THREAT_LEVEL greytider detected." + attack_one = "BOT beats CRIMINAL with the chain of command!" + attack_two = "BOT beats you with the chain of command!" + +/datum/beepsky_fashion/king + obj_icon_state = "king" + name = "King Beepsky" + desc = "He who has ascended to bare the right of king, sits atop the throne." + capture_one = "BOT is calling the guards onto CRIMINAL!" + capture_two = "BOT is calling the guards onto you!" + infraction = "Treason of level THREAT_LEVEL detected!" + attack_one = "BOT strikes CRIMINAL with his kingly authority!" + attack_two = "BOT strikes you with his kingly authority!" diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index bdaf018333..729bb4d33c 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -333,7 +333,7 @@ Auto Patrol: []"}, if(stored_fashion) stored_fashion.stun_attack(C) if(stored_fashion.stun_sound) - playsound(src, stun_sound, 50, TRUE, -1) + playsound(src, stored_fashion.stun_sound, 50, TRUE, -1) else playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) C.stuttering = 5