Merge pull request #565 from ArchieBeepBoop/anotherpatch

I'm fucking retarded. (Another function patch)
This commit is contained in:
QuoteFox
2020-10-08 04:55:49 +01:00
committed by GitHub
3 changed files with 7 additions and 11 deletions
-5
View File
@@ -86,8 +86,3 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
if(!wtime)
wtime = world.time
return time2text(wtime - GLOB.timezoneOffset, format)
//Approximate time in seconds, which it then calculates the ticks using the world's fps value and the master tick rate..
//Warning, this will likely be innacurate if the server is having tickrate issues. It's fine for shorter things though.
/proc/approximateSecondsToTicks(seconds)
return seconds*(world.fps/CONFIG_GET(number/mc_tick_rate/base_mc_tick_rate))/2
@@ -319,7 +319,7 @@
/obj/effect/mob_spawn/human/exiled/Initialize(mapload)
. = ..()
delayusability(900)
delayusability(9000, FALSE) //Probably should not show up on the menu? It gives it away that snowdin is the away mission.
var/arrpee = rand(1,3)
switch(arrpee)
if(1)
+6 -5
View File
@@ -86,13 +86,14 @@
/obj/effect/mob_spawn/proc/equip(mob/M)
return
/obj/effect/mob_spawn/proc/delayusability(seconds)
addtimer(CALLBACK(src, .proc/enableghostrole), approximateSecondsToTicks(seconds))
/obj/effect/mob_spawn/proc/delayusability(deciseconds, showOnMenu) //How many deciseconds until it is enabled, + should it show up on the menu?
addtimer(CALLBACK(src, .proc/enableghostrole, showOnMenu), deciseconds)
/obj/effect/mob_spawn/proc/enableghostrole()
/obj/effect/mob_spawn/proc/enableghostrole(show)
ghost_usable = TRUE
GLOB.poi_list |= src
LAZYADD(GLOB.mob_spawners[job_description ? job_description : name], src)
if (show == TRUE)
GLOB.poi_list |= src
LAZYADD(GLOB.mob_spawners[job_description ? job_description : name], src)
/obj/effect/mob_spawn/proc/create(ckey, name)
var/mob/living/M = new mob_type(get_turf(src)) //living mobs only