diff --git a/_maps/map_files/generic/City_of_Cogs.dmm b/_maps/map_files/generic/City_of_Cogs.dmm index 8ad5dcf07e10..1e314fe4ac17 100644 --- a/_maps/map_files/generic/City_of_Cogs.dmm +++ b/_maps/map_files/generic/City_of_Cogs.dmm @@ -21,9 +21,8 @@ /area/reebe/city_of_cogs) "af" = ( /obj/structure/table/reinforced/brass, -/obj/item/clockwork/slab, -/obj/item/clockwork/slab, -/obj/item/clockwork/slab, +/obj/item/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "ag" = ( @@ -197,6 +196,11 @@ /area/reebe/city_of_cogs) "aL" = ( /obj/structure/table/reinforced/brass, +/obj/item/clockwork/slab, +/obj/item/clockwork/slab, +/obj/item/clockwork/slab, +/obj/item/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/clockwork/reebe, /area/reebe/city_of_cogs) "aM" = ( @@ -220,6 +224,11 @@ /obj/machinery/door/airlock/clockwork/brass, /turf/open/indestructible/clock_spawn_room, /area/reebe/city_of_cogs) +"aQ" = ( +/obj/structure/table/reinforced/brass, +/obj/item/kitchen/fork, +/turf/open/floor/clockwork/reebe, +/area/reebe/city_of_cogs) "bj" = ( /obj/structure/destructible/clockwork/eminence_spire, /turf/open/floor/clockwork/reebe, @@ -3641,7 +3650,7 @@ aj aj aj ah -af +aL aj aj ag @@ -3821,7 +3830,7 @@ aj aj aj ah -af +aL ax aj aj @@ -4639,7 +4648,7 @@ aj aj aj ah -aL +af aj aj aj @@ -5007,7 +5016,7 @@ aj aj aj ah -aL +aQ am ai aj diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm index 2b1d9d5f02ca..7d9a7a3362d1 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -35,6 +35,8 @@ var/last_scream = 0 var/recalls_remaining = 1 var/recalling + var/next_spaghetti = 0 + var/spaghetti_cooldown = 50 /obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize() . = ..() @@ -58,6 +60,15 @@ hierophant_message("The Ark is taking damage!") last_scream = world.time + ARK_SCREAM_COOLDOWN +/obj/structure/destructible/clockwork/massive/celestial_gateway/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/kitchen/fork)) + if(world.time < next_spaghetti) + return + visible_message("[user] spins a serving of spaghetti out of [src].", "You reach your [I] into [src], pulling out a plateful of spaghetti!") + new /obj/item/reagent_containers/food/snacks/spaghetti/pastatomato(user.loc) + next_spaghetti = world.time + spaghetti_cooldown + . = ..() + /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/final_countdown(ark_time) //WE'RE LEAVING TOGETHEEEEEEEEER if(!ark_time) ark_time = 30 //minutes