А (#1424)

* А

* Update timer.lua

* F

Try

* Revert "F"

This reverts commit 8be8740.

code/modules/events/grey_tide.dm

@@ -1,4 +1,4 @@
-/datum/round_event_control/grey_tide
+/* /datum/round_event_control/grey_tide // ARK STATION REMOVED
 	name = "Grey Tide"
 	typepath = /datum/round_event/grey_tide
 	max_occurrences = 2
@@ -55,4 +55,4 @@
 // /obj/machinery/power/apc -- Signal turns the lighting channel off
 
 /datum/round_event/grey_tide/end()
-	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GREY_TIDE, grey_tide_areas)
+	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GREY_TIDE, grey_tide_areas) */

code/modules/power/cable.dm

@@ -559,7 +559,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
 				if(use(CABLE_RESTRAINTS_COST))
 					var/obj/item/restraints/handcuffs/cable/restraints = new(null, cable_color)
 					user.put_in_hands(restraints)
-		if("Noose") // ARK STATION ADDITION
+		if("Noose") // ARK STATION ADDITION START
 			if(amount < 30)
 				to_chat(user, "<span class='notice'>You don't have enough cable coil to make noose out of them</span>")
 				return
@@ -570,7 +570,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
 			if(!do_after(user, 3 SECONDS, user) || !use(30))
 				to_chat(user, "<span class='notice'>You fail to make cable noose, you need to be standing still to do it</span>")
 				return
-			new /obj/structure/chair/noose(get_turf(user))
+			new /obj/structure/chair/noose(get_turf(user)) // ARK STATION ADDITION END
 	update_appearance()
 
 

lua/timer.lua

@@ -60,8 +60,9 @@ __Timer_timer_process = function(seconds_per_tick)
 end
 
 function Timer.wait(time)
+	local yieldIndex = _exec.next_yield_index
 	__add_internal_timer(function()
-		SSlua:queue_resume(state.state, _exec.next_yield_index)
+		SSlua:queue_resume(state.state, yieldIndex)
 	end, time * 10, false)
 	coroutine.yield()
 end

modular_nova/modules/customization/modules/mob/living/carbon/human/species/hemophage/hemophage_species.dm

@@ -15,6 +15,7 @@
 		TRAIT_LITERATE,
 		TRAIT_DRINKS_BLOOD,
 		TRAIT_USES_SKINTONES,
+		TRAIT_NOTHIRST, // ARK STATION EDIT
 	)
 	inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC
 	exotic_bloodtype = "U"

zov_modular_arkstation/modules/big-sprites-pack/code.dm

@@ -19,6 +19,9 @@
 /turf/open/floor/catwalk_floor
 	icon = 'zov_modular_arkstation/modules/big-sprites-pack/catwalks.dmi'
 
+// /obj/structure/lattice/catwalk
+// 	icon = 'zov_modular_arkstation/modules/big-sprites-pack/catwalks.dmi'
+
 /atom/movable/screen/fullscreen/cult_teleportation
 	name = "cult teleportation"
 	icon = 'zov_modular_arkstation/modules/big-sprites-pack/cultTP.dmi'