From ed2dcc3424fac4d1928f079070c59cb0a1ce1572 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 2 Dec 2016 12:54:10 -0500 Subject: [PATCH 1/4] Why can't any of us find all these things --- .../mob/living/simple_animal/hostile/megafauna/swarmer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index edbd8f2fee3..37a0389bdce 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -156,7 +156,7 @@ var/global/list/AISwarmerCapsByType = list(/mob/living/simple_animal/hostile/swa /mob/living/simple_animal/hostile/swarmer/ai/proc/StartAction(deci = 0) stop_automated_movement = TRUE AIStatus = AI_OFF - addtimer(src, "EndAction", deci, FALSE) + addtimer(src, "EndAction", deci, TIMER_NORMAL) /mob/living/simple_animal/hostile/swarmer/ai/proc/EndAction() From 7d525c9c3ec4af5cd737559503ccad8ce7158564 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 2 Dec 2016 12:56:42 -0500 Subject: [PATCH 2/4] And another --- code/game/objects/items/weapons/grenades/syndieminibomb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm index 0e19162de1e..106093bab92 100644 --- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm +++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm @@ -46,7 +46,7 @@ if(isfloorturf(T)) var/turf/open/floor/F = T F.wet = TURF_WET_PERMAFROST - addtimer(F, "MakeDry", rand(3000, 3100), 0, TURF_WET_PERMAFROST) + addtimer(F, "MakeDry", rand(3000, 3100), TIMER_NORMAL, TURF_WET_PERMAFROST) for(var/mob/living/carbon/L in T) L.adjustStaminaLoss(stamina_damage) L.bodytemperature -= 230 From 0e9a26215c38003ea894bf330d796f7afaa2ce2a Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 2 Dec 2016 12:59:07 -0500 Subject: [PATCH 3/4] And another --- code/game/objects/items/charter.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 4cb8fc0b0af..5e88a8569ad 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -60,7 +60,7 @@ user << "Your name has been sent to your employers for approval." // Autoapproves after a certain time response_timer_id = addtimer(src, "rename_station", approval_time, \ - FALSE, new_name, user) + TIMER_NORMAL, new_name, user) admins << "CUSTOM STATION RENAME:[key_name_admin(user)] (?) proposes to rename the station to [new_name] (will autoapprove in [approval_time / 10] seconds). (BSA) (REJECT) (RPLY)" /obj/item/station_charter/proc/reject_proposed(user) From 65b2c6b83dfde924a28bfafd3f1f5954c26e2b72 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 2 Dec 2016 16:27:11 -0500 Subject: [PATCH 4/4] Fine fine --- code/game/objects/items/charter.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 5e88a8569ad..177f5999a10 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -59,8 +59,7 @@ user << "Your name has been sent to your employers for approval." // Autoapproves after a certain time - response_timer_id = addtimer(src, "rename_station", approval_time, \ - TIMER_NORMAL, new_name, user) + response_timer_id = addtimer(src, "rename_station", approval_time, TIMER_NORMAL, new_name, user) admins << "CUSTOM STATION RENAME:[key_name_admin(user)] (?) proposes to rename the station to [new_name] (will autoapprove in [approval_time / 10] seconds). (BSA) (REJECT) (RPLY)" /obj/item/station_charter/proc/reject_proposed(user)