Skip to content

Commit

Permalink
using a fork on the ark creates spaghetti (#9013)
Browse files Browse the repository at this point in the history
* ark produces spaghetti on being hit with a fork

* spaghetti and cooldowns

* Update ark_of_the_clockwork_justicar.dm

* whoops

* city of cogs has forks to attain spaghetti with
  • Loading branch information
SomeguyManperson committed Jun 26, 2020
1 parent baf7fe5 commit b703b36
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
23 changes: 16 additions & 7 deletions _maps/map_files/generic/City_of_Cogs.dmm
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand All @@ -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,
Expand Down Expand Up @@ -3641,7 +3650,7 @@ aj
aj
aj
ah
af
aL
aj
aj
ag
Expand Down Expand Up @@ -3821,7 +3830,7 @@ aj
aj
aj
ah
af
aL
ax
aj
aj
Expand Down Expand Up @@ -4639,7 +4648,7 @@ aj
aj
aj
ah
aL
af
aj
aj
aj
Expand Down Expand Up @@ -5007,7 +5016,7 @@ aj
aj
aj
ah
aL
aQ
am
ai
aj
Expand Down
Expand Up @@ -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()
. = ..()
Expand All @@ -58,6 +60,15 @@
hierophant_message("<span class='big boldwarning'>The Ark is taking damage!</span>")
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("<span class='brass'>[user] spins a serving of spaghetti out of [src].", "<span class='brass'>You reach your [I] into [src], pulling out a plateful of spaghetti!</span>")
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
Expand Down

0 comments on commit b703b36

Please sign in to comment.