diff --git a/code/defines/mob/simple_animal/life.dm b/code/defines/mob/simple_animal/life.dm index 1ae1f17ac1..8abed85fe2 100644 --- a/code/defines/mob/simple_animal/life.dm +++ b/code/defines/mob/simple_animal/life.dm @@ -3,8 +3,8 @@ var/icon_dead = "" var/max_health = 20 var/alive = 1 - var/list/speak = list() - var/list/speak_emote = list() //Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable. + var/list/speak = null + var/list/speak_emote = null//list() Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable. var/speak_chance = 0 var/list/emote_hear = list() //EHearable emotes var/list/emote_see = list() //Unlike speak_emote, the list of things in this variable only show by themselves with no spoken text. IE: Ian barks, Ian yaps @@ -46,8 +46,8 @@ icon_state = "corgi" icon_living = "corgi" icon_dead = "corgi_dead" - //speak = list("YAP","Woof!","Hoot!","AUUUUUU") - //speak_emote = list("barks", "woofs") + speak = list("YAP","Woof!","Hoot!","AUUUUUU") + speak_emote = list("barks", "woofs") emote_hear = list("barks","woofs","yaps") emote_see = list("shakes it's head", "shivers") speak_chance = 1 diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index a016b3d9f5..4b40652a5d 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -19,18 +19,18 @@ start_state.count() spawn (20) var/turf/location = pick(blobstart) - blobs = list() new /obj/blob(location) + location = pick(blobstart) +// if(!locate(/obj/blob in location)) +// new/obj/blob(location) ..() /datum/game_mode/blob/process() - if (prob(2)) + if(prob(2)) spawn_meteors() - life() - stage() @@ -122,7 +122,7 @@ /datum/game_mode/blob/check_finished() - if(stage >= 4) + if((stage >= 4)||(stage <= 1)) return 1 for(var/obj/blob/B in blobs) diff --git a/code/game/objects/radio/signaler.dm b/code/game/objects/radio/signaler.dm index 88400ab546..464e5db8a0 100644 --- a/code/game/objects/radio/signaler.dm +++ b/code/game/objects/radio/signaler.dm @@ -24,7 +24,7 @@ Unsecure()//Code that has to happen when the assembly is taken off of the ready state goes here Attach_Assembly(var/obj/A, var/mob/user)//Called when an assembly is attacked by another Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var - + Holder_Movement() IsAssembly() return 1 diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index a1c250bdc8..91783d1abd 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -25,6 +25,7 @@ Unsecure() Attach_Assembly(var/obj/A, var/mob/user) Process_cooldown() + Holder_Movement() IsAssembly() diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index a21d677fd0..2846e15d43 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -26,6 +26,7 @@ Unsecure()//Code that has to happen when the assembly is taken off of the ready state goes here Attach_Assembly(var/obj/A, var/mob/user)//Called when an assembly is attacked by another Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var + Holder_Movement() toggle_scan() sense() diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index dbd1022e1c..18898894bb 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -23,6 +23,7 @@ Unsecure()//Code that has to happen when the assembly is taken off of the ready state goes here Attach_Assembly(var/obj/A, var/mob/user)//Called when an assembly is attacked by another Process_cooldown()//Call this via spawn(10) to have it count down the cooldown var + Holder_Movement() timer_end() IsAssembly()