diff --git a/baystation12.dme b/baystation12.dme index bff4edbeca1..31731f48347 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -292,7 +292,6 @@ #include "code\defines\mob\living\carbon\alien_larva.dm" #include "code\defines\mob\living\carbon\carbon.dm" #include "code\defines\mob\living\carbon\metroid.dm" -#include "code\defines\mob\living\carbon\monkey.dm" #include "code\defines\mob\living\silicon\ai.dm" #include "code\defines\mob\living\silicon\decoy.dm" #include "code\defines\mob\living\silicon\pai.dm" diff --git a/code/defines/mob/living/carbon/monkey.dm b/code/defines/mob/living/carbon/monkey.dm deleted file mode 100644 index 34e36db72e6..00000000000 --- a/code/defines/mob/living/carbon/monkey.dm +++ /dev/null @@ -1,16 +0,0 @@ -/mob/living/carbon/monkey - name = "monkey" - voice_name = "monkey" - voice_message = "chimpers" - say_message = "chimpers" - icon = 'monkey.dmi' - icon_state = "monkey1" - gender = NEUTER - pass_flags = PASSTABLE - - var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie - -/mob/living/carbon/monkey/rpbody // For admin RP - update_icon = 0 - voice_message = "says" - say_message = "says" diff --git a/code/game/machinery/computer/lockdown.dm b/code/game/machinery/computer/lockdown.dm index 3ae275eca91..328a1d2abc5 100644 --- a/code/game/machinery/computer/lockdown.dm +++ b/code/game/machinery/computer/lockdown.dm @@ -35,6 +35,7 @@ connectedDoorIds.Add("Observation Shutters") connectedDoorIds.Add("Patient Room 1 Shutters") connectedDoorIds.Add("Patient Room 2 Shutters") + connectedDoorIds.Add("Patient Room 3 Shutters") //loop through the world, grabbing all the relevant doors spawn(1) diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 9f4853ec203..074c6075f51 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -65,7 +65,7 @@ msg = "The escape shuttle countdown reads: [time]" if(2) if(message1 && message2) - msg = "The screen states the two following message. [message1] , [message2]" + msg = "The screen states the two following messages: [message1] , [message2]" else if(message1) msg = "The screen states the following message. [message1]" else if(message2) @@ -76,7 +76,7 @@ if(4) var/time = get_supply_shuttle_timer() if(time) - msg = "The screen states the time until the supply shuttle arrive. \n Time remaining: [time]" + msg = "The screen states the time until the supply shuttle arrival. \n Time remaining: [time]" usr << msg return diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 29a8acacd3f..53038129861 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -38,7 +38,7 @@ var/list/supply_groups = new() /obj/structure/plasticflaps //HOW DO YOU CALL THOSE THINGS ANYWAY name = "Plastic flaps" - desc = "I definitely cant get past those. no way." + desc = "Durable plastic flaps." icon = 'stationobjs.dmi' //Change this. icon_state = "plasticflaps" density = 0 diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index a1f797f8f6e..a20c54fda61 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -1,10 +1,19 @@ /mob/living/carbon/monkey - var - oxygen_alert = 0 - toxins_alert = 0 - fire_alert = 0 + name = "monkey" + voice_name = "monkey" + voice_message = "chimpers" + say_message = "chimpers" + icon = 'monkey.dmi' + icon_state = "monkey1" + gender = NEUTER + pass_flags = PASSTABLE - temperature_alert = 0 + var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie + + var/oxygen_alert = 0 + var/toxins_alert = 0 + var/fire_alert = 0 + var/temperature_alert = 0 /mob/living/carbon/monkey/Life() @@ -37,6 +46,7 @@ //to find it. src.blinded = null + //Disease Check handle_virus_updates() diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index af989f81167..b0b953f75ef 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -10,7 +10,7 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "malf AI" = IS_MODE_COMPILED("malfunction"), "revolutionary" = IS_MODE_COMPILED("revolution"), "alien candidate" = 1, //always show - "pai candidate" = 1, // -- TLE + "pAI candidate" = 1, // -- TLE "cultist" = IS_MODE_COMPILED("cult"), "infested monkey" = IS_MODE_COMPILED("monkey"), ) @@ -176,7 +176,7 @@ datum/preferences dat += "Coughing? [disabilities & (1<<2) ? "Yes" : "No"]
" dat += "Tourettes/Twitching? [disabilities & (1<<3) ? "Yes" : "No"]
" dat += "Nervousness? [disabilities & (1<<4) ? "Yes" : "No"]
" - dat += "Trenna's Disorder? (Deafness) [disabilities & (1<<5) ? "Yes" : "No"]
" + dat += "Deafness? [disabilities & (1<<5) ? "Yes" : "No"]
" dat += "
Flavor Text
" dat += "Change
" @@ -193,7 +193,7 @@ datum/preferences dat += "Be [i]: [src.be_special&(1<
" n++ else - dat += "You are banned from being syndicate." + dat += "You are banned from being Syndicate." src.be_special = 0 dat += "
"