This commit is contained in:
Fox McCloud
2018-07-27 14:51:04 -04:00
parent fc89432b36
commit 4f10f52c7e
5 changed files with 7 additions and 7 deletions
+1 -3
View File
@@ -370,6 +370,4 @@
// used for alternate_option
#define GET_RANDOM_JOB 0
#define BE_ASSISTANT 1
#define RETURN_TO_LOBBY 2
#define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")
#define RETURN_TO_LOBBY 2
+3 -1
View File
@@ -31,4 +31,6 @@ var/list/round_end_sounds = list( // Maps available round end sounds to their du
'sound/goonstation/misc/newround2.ogg' = 14.8 SECONDS
)
GLOBAL_LIST(station_level_space_turfs)
GLOBAL_LIST(station_level_space_turfs)
#define EGG_LAYING_MESSAGES list("lays an egg.", "squats down and croons.", "begins making a huge racket.", "begins clucking raucously.")
@@ -159,7 +159,7 @@
if(!ScientistCheck(user))
return
if(!console)
to_chat(user, "<span class='warning'>The device is not linked to console!</span>")
to_chat(user, "<span class='warning'>The device is not linked to a console!</span>")
return
if(mode == GIZMO_SCAN)
@@ -167,7 +167,7 @@
human_only = TRUE
icon_state = "species"
mind_control_uses = 5
mind_control_duration = 300
mind_control_duration = 3000
/obj/item/organ/internal/heart/gland/pop/activate()
to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
@@ -234,7 +234,7 @@ var/global/chicken_count = 0
can_hide = 1
can_collar = 1
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")
var/list/layMessage = EGG_LAYING_MESSAGES
var/list/validColors = list("brown","black","white")
gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY