diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index 97205483743..0c332d46a72 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -20,13 +20,13 @@ if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(istype(H.shoes, /obj/item/clothing/shoes/clown_shoes)) + var/obj/item/clothing/shoes/clown_shoes/O = H.shoes if(H.m_intent == "run") - if(H.footstep >= 2) - H.footstep = 0 - else - H.footstep++ - if(H.footstep == 0) + if(O.footstep >= 2) + O.footstep = 0 playsound(src, "clownstep", 50, 1) // this will get annoying very fast. + else + O.footstep++ else playsound(src, "clownstep", 20, 1) @@ -55,7 +55,7 @@ M.inertia_dir = 0 return - if(2) //lube + if(2) //lube //can cause infinite loops - needs work if(!istype(M, /mob/living/carbon/metroid)) M.stop_pulling() step(M, M.dir) diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index e39319dc06a..ce9138e3a20 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -231,7 +231,7 @@ else if(ismetroid(M)) M_job = "Metroid" else if(ismonkey(M)) - M_job = "Moneky" + M_job = "Monkey" else if(isalien(M)) //aliens if(islarva(M)) M_job = "Alien larva" diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index d266e4ce5f5..8ae2cfeacb1 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -70,6 +70,7 @@ item_state = "clown_shoes" slowdown = SHOES_SLOWDOWN+1 color = "clown" + var/footstep = 1 //used for squeeks whilst walking /obj/item/clothing/shoes/jackboots name = "jackboots" diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 153dfa0d46a..4a839bd050d 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -1,5 +1,4 @@ /mob/living/carbon/human - //Hair colour and style var/r_hair = 0 var/g_hair = 0 diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9ae7e9f5076..c9c3d1bd120 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -36,7 +36,6 @@ var/obj/screen/zone_sel/zone_sel = null var/damageoverlaytemp = 0 - var/emote_allowed = 1 var/computer_id = null var/lastattacker = null var/lastattacked = null @@ -127,7 +126,6 @@ var/coughedtime = null var/inertia_dir = 0 - var/footstep = 1 var/music_lastplayed = "null" @@ -171,7 +169,7 @@ var/obj/effect/proc_holder/spell/list/spell_list = list() //Changlings, but can be used in other modes - var/obj/effect/proc_holder/changpower/list/power_list = list() +// var/obj/effect/proc_holder/changpower/list/power_list = list() //List of active diseases