mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-03 22:12:38 +00:00
A few minor fixes.
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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()
|
||||
|
||||
|
||||
@@ -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? <a href=\"byond://?src=\ref[user];preferences=1;disabilities=2\">[disabilities & (1<<2) ? "Yes" : "No"]</a><br>"
|
||||
dat += "Tourettes/Twitching? <a href=\"byond://?src=\ref[user];preferences=1;disabilities=3\">[disabilities & (1<<3) ? "Yes" : "No"]</a><br>"
|
||||
dat += "Nervousness? <a href=\"byond://?src=\ref[user];preferences=1;disabilities=4\">[disabilities & (1<<4) ? "Yes" : "No"]</a><br>"
|
||||
dat += "Trenna's Disorder? (Deafness) <a href=\"byond://?src=\ref[user];preferences=1;disabilities=5\">[disabilities & (1<<5) ? "Yes" : "No"]</a><br>"
|
||||
dat += "Deafness? <a href=\"byond://?src=\ref[user];preferences=1;disabilities=5\">[disabilities & (1<<5) ? "Yes" : "No"]</a><br>"
|
||||
|
||||
dat += "<hr><b>Flavor Text</b><br>"
|
||||
dat += "<a href='byond://?src=\ref[user];preferences=1;flavor_text=1'>Change</a><br>"
|
||||
@@ -193,7 +193,7 @@ datum/preferences
|
||||
dat += "<b>Be [i]:</b> <a href=\"byond://?src=\ref[user];preferences=1;be_special=[n]\"><b>[src.be_special&(1<<n) ? "Yes" : "No"]</b></a><br>"
|
||||
n++
|
||||
else
|
||||
dat += "<b>You are banned from being syndicate.</b>"
|
||||
dat += "<b>You are banned from being Syndicate.</b>"
|
||||
src.be_special = 0
|
||||
dat += "<hr>"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user