- Added Cheri's lizard and monkey pelt sprites for tanning

- Added a 'time between ticks' status display for admins as well as this being calculated.
- Made the malf countdown take this into account. Now if you hacked 3 APCs, which means you'd normally have your points reduced by 0.5 per tick, you get it reduced by 0.5 * last_tick_duration

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3807 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-06-12 23:13:37 +00:00
parent c9451df024
commit b6a6b8614d
5 changed files with 24 additions and 2 deletions

View File

@@ -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."

View File

@@ -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()

View File

@@ -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

View File

@@ -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)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 60 KiB