diff --git a/code/defines/tanning/leather.dm b/code/defines/tanning/leather.dm index 65281fc6aaf..3045159a625 100644 --- a/code/defines/tanning/leather.dm +++ b/code/defines/tanning/leather.dm @@ -19,6 +19,20 @@ icon_state = "sheet-cat" origin_tech = "" +/obj/item/stack/sheet/animalhide/monkey + name = "monkey hide" + desc = "The by-product of monkey farming." + singular_name = "monkey hide piece" + icon_state = "sheet-monkey" + origin_tech = "" + +/obj/item/stack/sheet/animalhide/lizard + name = "lizard skin" + desc = "Sssssss..." + singular_name = "lizard skin piece" + icon_state = "sheet-lizard" + origin_tech = "" + /obj/item/stack/sheet/hairlesshide name = "hairless hide" desc = "This hide was stripped of it's hair, but still needs tanning." diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index fff044d7959..f8a6a92a3e2 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -86,7 +86,7 @@ /datum/game_mode/malfunction/process() if (apcs >= 3 && malf_mode_declared) - AI_win_timeleft -= (apcs/6) //Victory timer now de-increments based on how many APCs are hacked. --NeoFite + AI_win_timeleft -= ((apcs/6)*last_tick_duration) //Victory timer now de-increments based on how many APCs are hacked. --NeoFite ..() if (AI_win_timeleft<=0) check_win() diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm index cc43b2d0ea1..942491df36e 100644 --- a/code/game/master_controller.dm +++ b/code/game/master_controller.dm @@ -4,7 +4,8 @@ var/global/controllernum = "no" var/global/controller_iteration = 0 - +var/global/last_tick_timeofday = world.timeofday +var/global/last_tick_duration = 0 datum/controller/game_controller @@ -100,6 +101,11 @@ datum/controller/game_controller spawn(0) Failsafe.spin() + var/currenttime = world.timeofday + var/diff = (currenttime - last_tick_timeofday) / 10 + world << "timeofday = [currenttime]; Diff = [diff]s" + last_tick_timeofday = currenttime + last_tick_duration = diff if(!processing) return 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1a9a8599eef..41a36c8530e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -762,6 +762,8 @@ note dizziness decrements automatically in the mob's Life() proc. stat(null, "Controller: [controllernum]") if (master_controller) stat(null, "Current Iteration: [controller_iteration]") + stat(null, "Time between ticks: [last_tick_duration]") + if (spell_list.len) diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 9904f624b91..bcde11af0a6 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ