mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-15 18:06:57 +01:00
Merge branch 'master' of https://github.com/KabKebab/GS13
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
#define BREAKFAST (1<<13)
|
||||
#define CLOTH (1<<14)
|
||||
#define ANTITOXIC (1<<15)
|
||||
#define BLESSED (1<<16)
|
||||
|
||||
#define DRINK_NICE 1
|
||||
#define DRINK_GOOD 2
|
||||
|
||||
@@ -196,3 +196,13 @@
|
||||
name = "City of Cogs"
|
||||
icon_state = "purple"
|
||||
hidden = FALSE
|
||||
|
||||
|
||||
/area/fatlab //GS13 - move this elsewhere later
|
||||
name = "Mysterious Facility"
|
||||
icon_state = "centcom"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = FALSE
|
||||
has_gravity = STANDARD_GRAVITY
|
||||
noteleport = TRUE
|
||||
flags_1 = NONE
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
resistance_flags = FLAMMABLE
|
||||
var/foodtype = NONE
|
||||
var/last_check_time
|
||||
var/blessed = 0 // GS13
|
||||
|
||||
/obj/item/reagent_containers/food/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -47,4 +48,4 @@
|
||||
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
|
||||
last_check_time = world.time
|
||||
|
||||
#undef STOP_SERVING_BREAKFAST
|
||||
#undef STOP_SERVING_BREAKFAST
|
||||
|
||||
Reference in New Issue
Block a user