diff --git a/.gitignore b/.gitignore
index 12d7d356..1b85f092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,25 +4,9 @@
*.rsc
*.dmb
*.lk
-data/mode.txt
-maps/backup/bay.dmm
-maps/bay.dmm
-maps/bay.dmm
-maps/chris.dmm
-maps/sam.dmm
-maps/tgstation2.dmm.bak
*.bak
-maps/newmedical tgstation2.dmm
*.bak2
-maps/tgstation2_medbayrework_final.dmm
-Outpost.dmm
-data/investigate/gravity.html
+*.backup
data/investigate/gravity.html
config/admins.txt
-config/admin_ranks.txt
-data/investigate/gravity.html
-data/investigate/gravity.html
-data/investigate/gravity.html
-data/investigate/gravity.html
-data/investigate/gravity.html
-data/investigate/gravity.html
+config/admin_ranks.txt
\ No newline at end of file
diff --git a/SQL/aurora_schema.sql b/SQL/aurora_schema.sql
index 850d9fe9..8c6d58a2 100644
--- a/SQL/aurora_schema.sql
+++ b/SQL/aurora_schema.sql
@@ -48,6 +48,8 @@ CREATE TABLE `ss13_warnings` (
`computerid` VARCHAR(32) NOT NULL,
`ip` VARCHAR(32) NOT NULL,
`a_ckey` VARCHAR(32) NOT NULL,
+ `acknowledged` TINYINT(1) NULL DEFAULT '0',
+ `visible` TINYINT(1) NULL DEFAULT '1';
PRIMARY KEY (`id`)
) ENGINE=INNODB DEFAULT CHARSET=LATIN1;
@@ -71,8 +73,12 @@ CREATE TABLE `ss13_news` (
`publishtime` INT(11) NOT NULL,
`channel` VARCHAR(64) NOT NULL,
`author` VARCHAR(64) NOT NULL,
+ `title` VARCHAR(64) NOT NULL,
`body` TEXT NOT NULL,
- `notpublishing` TINYINT(1) DEFAULT NULL,
+ `status` TINYINT(1) NOT NULL DEFAULT 1,
+ `uploadip` VARCHAR(18) NOT NULL,
+ `uploadtime` DATETIME NOT NULL,
+ `approvetime` DATETIME DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=INNODB DEFAULT CHARSET=LATIN1;
@@ -93,4 +99,4 @@ CREATE TABLE `ss13_notes` (
`lasteditor` VARCHAR(32) NULL DEFAULT NULL,
`lasteditdate` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=LATIN1;
\ No newline at end of file
+) ENGINE=INNODB DEFAULT CHARSET=LATIN1;
diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm
index 5536e6b4..eafca057 100644
--- a/code/__HELPERS/mobs.dm
+++ b/code/__HELPERS/mobs.dm
@@ -97,3 +97,51 @@ proc/RoundHealth(health)
else
return "health-100"
return "0"
+
+
+/proc/this_guy_is_allowed_to_drag_that_guy_into_something(atom/movable/target as mob|obj, mob/user as mob, obj/target_object as obj)
+ if(istype(target, /obj/screen)) //fix for HUD elements making their way into the world - Pete
+ return
+ if(target.loc == user) //no you can't pull things out of your ass
+ return
+ if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.resting) //are you cuffed, dying, lying, stunned or other
+ return
+ if(get_dist(user, target_object) > 1 || get_dist(user, target) > 1 || user.contents.Find(target_object)) // is the mob anchored, too far away from you, or are you too far away from the source
+ return
+ if(!ismob(target)) //mobs only
+ return
+ if(!ishuman(user) && !isrobot(user)) //No ghosts or mice putting people into the sleeper
+ return
+ if(istype(user, /mob/living/silicon/robot/drone)) // drones don't get to use medical machinery
+ return
+ if(user.loc==null) // just in case someone manages to get a closet into the blue light dimension, as unlikely as that seems
+ return
+ if(!istype(user.loc, /turf) || !istype(target.loc, /turf)) // are you in a container/closet/pod/etc?
+ return
+ var/mob/living/L = target
+ if(!istype(L) || L.buckled)
+ return
+ return TRUE
+
+
+/proc/this_is_an_animal_or_a_robot(atom/movable/target as mob|obj)
+ return (istype(target, /mob/living/simple_animal) || istype(target, /mob/living/silicon))
+
+
+/proc/allowed_to_add_this_person_to_a_medical_machine(atom/movable/target as mob|obj, mob/user as mob, obj/target_object as obj, var/occupant)
+ if(!this_guy_is_allowed_to_drag_that_guy_into_something(target,user,target_object))
+ return
+ if(this_is_an_animal_or_a_robot(target))
+ return
+ if(occupant)
+ user << "\blue The [target_object] is already occupied!"
+ return
+ var/mob/living/L = target
+ if(L.abiotic())
+ user << "\red Subject cannot have abiotic items on."
+ return
+ for(var/mob/living/carbon/slime/M in range(1,L))
+ if(M.Victim == L)
+ usr << "\red [L.name] will not fit into the [target_object] because they have a slime latched onto their head."
+ return
+ return TRUE
\ No newline at end of file
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index b1a391cb..e674fc1a 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -734,6 +734,15 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl
return 0
return 1
+
+// this works like do_after but needs the target to stay still as well
+/proc/do_after_to_target(var/mob/user as mob, target, delay as num, var/numticks = 5, var/needhand = 1)
+ var/target_original_turf = get_turf(target)
+ if (do_after(user,delay,numticks,needhand))
+ if (get_turf(target)==target_original_turf)
+ return TRUE
+ return FALSE
+
//Takes: Anything that could possibly have variables and a varname to check.
//Returns: 1 if found, 0 if not.
diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm
index 63630ea4..a02c03d0 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -153,6 +153,12 @@
Topic(src, list("src"= "\ref[src]", "command"="enable", "value"="[!enabled]"), 1)
return 1
+/obj/machinery/power/emitter/AICtrlClick() // locks emitters
+ if(emagged) // can't lock emagged stuff
+ return 1
+ locked = !locked
+ return 1
+
/atom/proc/AIAltClick(var/atom/A)
AltClick(A)
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 2f7a2797..4f8e0846 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -120,6 +120,19 @@
src.add_fingerprint(usr)
return
+
+/obj/machinery/dna_scannernew/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+ if(!allowed_to_add_this_person_to_a_medical_machine(O,user,src,occupant))
+ return
+ var/mob/living/L = O
+ if(L == user)
+ return
+ visible_message("[user] puts [L.name] into the DNA Scanner.", 3)
+ put_in(L)
+ if(user.pulling == L)
+ user.pulling = null
+
+
/obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob)
if(istype(item, /obj/item/weapon/reagent_containers/glass))
if(beaker)
@@ -829,4 +842,5 @@
return 1
+
/////////////////////////// DNA MACHINES
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index b74f9604..d2a7d0e2 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -171,268 +171,298 @@
idle_power_usage = 15
active_power_usage = 200 //builtin health analyzer, dialysis machine, injectors.
- New()
- ..()
- beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large()
- spawn( 5 )
- if(orient == "RIGHT")
- icon_state = "sleeper_0-r"
- return
+/obj/machinery/sleeper/New()
+ ..()
+ beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large()
+ spawn( 5 )
+ if(orient == "RIGHT")
+ icon_state = "sleeper_0-r"
+ return
+ return
+
+
+/obj/machinery/sleeper/allow_drop()
+ return 0
+
+
+/obj/machinery/sleeper/process()
+ if (stat & (NOPOWER|BROKEN))
return
-
- allow_drop()
- return 0
-
-
- process()
- if (stat & (NOPOWER|BROKEN))
- return
-
- if(filtering > 0)
- if(beaker)
- if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
+ if(filtering > 0)
+ if(beaker)
+ if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
+ src.occupant.vessel.trans_to(beaker, 1)
+ for(var/datum/reagent/x in src.occupant.reagents.reagent_list)
+ src.occupant.reagents.trans_to(beaker, 3)
src.occupant.vessel.trans_to(beaker, 1)
- for(var/datum/reagent/x in src.occupant.reagents.reagent_list)
- src.occupant.reagents.trans_to(beaker, 3)
- src.occupant.vessel.trans_to(beaker, 1)
- src.updateUsrDialog()
- return
+ src.updateUsrDialog()
+ return
- blob_act()
- if(prob(75))
- for(var/atom/movable/A as mob|obj in src)
- A.loc = src.loc
- A.blob_act()
- del(src)
- return
+/obj/machinery/sleeper/blob_act()
+ if(prob(75))
+ for(var/atom/movable/A as mob|obj in src)
+ A.loc = src.loc
+ A.blob_act()
+ del(src)
+ return
- attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
- if(istype(G, /obj/item/weapon/reagent_containers/glass))
- if(!beaker)
- beaker = G
- user.drop_item()
- G.loc = src
- user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
- src.updateUsrDialog()
- return
- else
- user << "\red The sleeper has a beaker already."
+/obj/machinery/sleeper/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+ if(istype(G, /obj/item/weapon/reagent_containers/glass))
+ if(!beaker)
+ beaker = G
+ user.drop_item()
+ G.loc = src
+ user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
+ src.updateUsrDialog()
+ return
+ else
+ user << "\red The sleeper has a beaker already."
+ return
+
+ else if(istype(G, /obj/item/weapon/grab))
+ if(!ismob(G:affecting))
+ return
+
+ if(src.occupant)
+ user << "\blue The sleeper is already occupied!"
+ return
+
+ for(var/mob/living/carbon/slime/M in range(1,G:affecting))
+ if(M.Victim == G:affecting)
+ usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head."
return
- else if(istype(G, /obj/item/weapon/grab))
- if(!ismob(G:affecting))
- return
+ visible_message("[user] starts putting [G:affecting:name] into the sleeper.", 3)
+ if(do_after(user, 20))
if(src.occupant)
user << "\blue The sleeper is already occupied!"
return
+ if(!G || !G:affecting) return
+ var/mob/M = G:affecting
+ if(M.client)
+ M.client.perspective = EYE_PERSPECTIVE
+ M.client.eye = src
+ M.loc = src
+ update_use_power(2)
+ src.occupant = M
+ src.icon_state = "sleeper_1"
+ if(orient == "RIGHT")
+ icon_state = "sleeper_1-r"
- for(var/mob/living/carbon/slime/M in range(1,G:affecting))
- if(M.Victim == G:affecting)
- usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head."
- return
-
- visible_message("[user] starts putting [G:affecting:name] into the sleeper.", 3)
-
- if(do_after(user, 20))
- if(src.occupant)
- user << "\blue The sleeper is already occupied!"
- return
- if(!G || !G:affecting) return
- var/mob/M = G:affecting
- if(M.client)
- M.client.perspective = EYE_PERSPECTIVE
- M.client.eye = src
- M.loc = src
- update_use_power(2)
- src.occupant = M
- src.icon_state = "sleeper_1"
- if(orient == "RIGHT")
- icon_state = "sleeper_1-r"
-
- src.add_fingerprint(user)
- del(G)
- return
+ src.add_fingerprint(user)
+ del(G)
return
+ return
- ex_act(severity)
- if(filtering)
- toggle_filter()
- switch(severity)
- if(1.0)
+/obj/machinery/sleeper/ex_act(severity)
+ if(filtering)
+ toggle_filter()
+ switch(severity)
+ if(1.0)
+ for(var/atom/movable/A as mob|obj in src)
+ A.loc = src.loc
+ ex_act(severity)
+ del(src)
+ return
+ if(2.0)
+ if(prob(50))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
del(src)
return
- if(2.0)
- if(prob(50))
- for(var/atom/movable/A as mob|obj in src)
- A.loc = src.loc
- ex_act(severity)
- del(src)
- return
- if(3.0)
- if(prob(25))
- for(var/atom/movable/A as mob|obj in src)
- A.loc = src.loc
- ex_act(severity)
- del(src)
- return
- return
- emp_act(severity)
- if(filtering)
- toggle_filter()
- if(stat & (BROKEN|NOPOWER))
- ..(severity)
- return
- if(occupant)
- go_out()
- ..(severity)
-
- alter_health(mob/living/M as mob)
- if (M.health > 0)
- if (M.getOxyLoss() >= 10)
- var/amount = max(0.15, 1)
- M.adjustOxyLoss(-amount)
- else
- M.adjustOxyLoss(-12)
- M.updatehealth()
- M.AdjustParalysis(-4)
- M.AdjustWeakened(-4)
- M.AdjustStunned(-4)
- M.Paralyse(1)
- M.Weaken(1)
- M.Stun(1)
- if (M:reagents.get_reagent_amount("inaprovaline") < 5)
- M:reagents.add_reagent("inaprovaline", 5)
- return
- proc/toggle_filter()
- if(!src.occupant)
- filtering = 0
- return
- if(filtering)
- filtering = 0
- else
- filtering = 1
-
- proc/go_out()
- if(filtering)
- toggle_filter()
- if(!src.occupant)
- return
- if(src.occupant.client)
- src.occupant.client.eye = src.occupant.client.mob
- src.occupant.client.perspective = MOB_PERSPECTIVE
- src.occupant.loc = src.loc
- src.occupant = null
- update_use_power(1)
- if(orient == "RIGHT")
- icon_state = "sleeper_0-r"
- return
-
-
- proc/inject_chemical(mob/living/user as mob, chemical, amount)
- if(src.occupant && src.occupant.reagents)
- if(src.occupant.reagents.get_reagent_amount(chemical) + amount <= 20)
- src.occupant.reagents.add_reagent(chemical, amount)
- user << "Occupant now has [src.occupant.reagents.get_reagent_amount(chemical)] units of [available_chemicals[chemical]] in his/her bloodstream."
+ if(3.0)
+ if(prob(25))
+ for(var/atom/movable/A as mob|obj in src)
+ A.loc = src.loc
+ ex_act(severity)
+ del(src)
return
- user << "There's no occupant in the sleeper or the subject has too many chemicals!"
+ return
+
+/obj/machinery/sleeper/emp_act(severity)
+ if(filtering)
+ toggle_filter()
+ if(stat & (BROKEN|NOPOWER))
+ ..(severity)
return
+ if(occupant)
+ go_out()
+ ..(severity)
-
- proc/check(mob/living/user as mob)
- if(src.occupant)
- user << text("\blue Occupant ([]) Statistics:", src.occupant)
- var/t1
- switch(src.occupant.stat)
- if(0.0)
- t1 = "Conscious"
- if(1.0)
- t1 = "Unconscious"
- if(2.0)
- t1 = "*dead*"
- else
- user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "\blue " : "\red "), src.occupant.health, t1)
- user << text("[]\t -Core Temperature: []°C ([]°F)
", (src.occupant.bodytemperature > 50 ? "" : ""), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67)
- user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss())
- user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss())
- user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss())
- user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss())
- user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)"
- user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5)
- if(src.beaker)
- user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
- else
- user << "\blue No Dialysis Output Beaker loaded."
+/obj/machinery/sleeper/alter_health(mob/living/M as mob)
+ if (M.health > 0)
+ if (M.getOxyLoss() >= 10)
+ var/amount = max(0.15, 1)
+ M.adjustOxyLoss(-amount)
else
- user << "\blue There is no one inside!"
+ M.adjustOxyLoss(-12)
+ M.updatehealth()
+ M.AdjustParalysis(-4)
+ M.AdjustWeakened(-4)
+ M.AdjustStunned(-4)
+ M.Paralyse(1)
+ M.Weaken(1)
+ M.Stun(1)
+ if (M:reagents.get_reagent_amount("inaprovaline") < 5)
+ M:reagents.add_reagent("inaprovaline", 5)
+ return
+
+/obj/machinery/sleeper/proc/toggle_filter()
+ if(!src.occupant)
+ filtering = 0
+ return
+ if(filtering)
+ filtering = 0
+ else
+ filtering = 1
+
+/obj/machinery/sleeper/proc/go_out()
+ if(filtering)
+ toggle_filter()
+ if(!src.occupant)
+ return
+ if(src.occupant.client)
+ src.occupant.client.eye = src.occupant.client.mob
+ src.occupant.client.perspective = MOB_PERSPECTIVE
+ src.occupant.loc = src.loc
+ src.occupant = null
+ update_use_power(1)
+ if(orient == "RIGHT")
+ icon_state = "sleeper_0-r"
+ return
+
+
+/obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount)
+ if(src.occupant && src.occupant.reagents)
+ if(src.occupant.reagents.get_reagent_amount(chemical) + amount <= 20)
+ src.occupant.reagents.add_reagent(chemical, amount)
+ user << "Occupant now has [src.occupant.reagents.get_reagent_amount(chemical)] units of [available_chemicals[chemical]] in his/her bloodstream."
+ return
+ user << "There's no occupant in the sleeper or the subject has too many chemicals!"
+ return
+
+
+/obj/machinery/sleeper/proc/check(mob/living/user as mob)
+ if(src.occupant)
+ user << text("\blue Occupant ([]) Statistics:", src.occupant)
+ var/t1
+ switch(src.occupant.stat)
+ if(0.0)
+ t1 = "Conscious"
+ if(1.0)
+ t1 = "Unconscious"
+ if(2.0)
+ t1 = "*dead*"
+ else
+ user << text("[]\t Health %: [] ([])", (src.occupant.health > 50 ? "\blue " : "\red "), src.occupant.health, t1)
+ user << text("[]\t -Core Temperature: []°C ([]°F)
", (src.occupant.bodytemperature > 50 ? "" : ""), src.occupant.bodytemperature-T0C, src.occupant.bodytemperature*1.8-459.67)
+ user << text("[]\t -Brute Damage %: []", (src.occupant.getBruteLoss() < 60 ? "\blue " : "\red "), src.occupant.getBruteLoss())
+ user << text("[]\t -Respiratory Damage %: []", (src.occupant.getOxyLoss() < 60 ? "\blue " : "\red "), src.occupant.getOxyLoss())
+ user << text("[]\t -Toxin Content %: []", (src.occupant.getToxLoss() < 60 ? "\blue " : "\red "), src.occupant.getToxLoss())
+ user << text("[]\t -Burn Severity %: []", (src.occupant.getFireLoss() < 60 ? "\blue " : "\red "), src.occupant.getFireLoss())
+ user << "\blue Expected time till occupant can safely awake: (note: If health is below 20% these times are inaccurate)"
+ user << text("\blue \t [] second\s (if around 1 or 2 the sleeper is keeping them asleep.)", src.occupant.paralysis / 5)
+ if(src.beaker)
+ user << text("\blue \t Dialysis Output Beaker has [] of free space remaining.", src.beaker.reagents.maximum_volume - src.beaker.reagents.total_volume)
+ else
+ user << "\blue No Dialysis Output Beaker loaded."
+ else
+ user << "\blue There is no one inside!"
+ return
+
+
+/obj/machinery/sleeper/verb/eject()
+ set name = "Eject Sleeper"
+ set category = "Object"
+ set src in oview(1)
+ if(usr.stat != 0)
+ return
+ if(orient == "RIGHT")
+ icon_state = "sleeper_0-r"
+ src.icon_state = "sleeper_0"
+ src.go_out()
+ add_fingerprint(usr)
+ return
+
+/obj/machinery/sleeper/verb/remove_beaker()
+ set name = "Remove Beaker"
+ set category = "Object"
+ set src in oview(1)
+ if(usr.stat != 0)
+ return
+ if(beaker)
+ filtering = 0
+ beaker.loc = usr.loc
+ beaker = null
+ add_fingerprint(usr)
+ return
+
+/obj/machinery/sleeper/verb/move_inside()
+ set name = "Enter Sleeper"
+ set category = "Object"
+ set src in oview(1)
+
+ if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr)))
return
-
- verb/eject()
- set name = "Eject Sleeper"
- set category = "Object"
- set src in oview(1)
- if(usr.stat != 0)
- return
- if(orient == "RIGHT")
- icon_state = "sleeper_0-r"
- src.icon_state = "sleeper_0"
- src.go_out()
- add_fingerprint(usr)
+ if(src.occupant)
+ usr << "\blue The sleeper is already occupied!"
return
- verb/remove_beaker()
- set name = "Remove Beaker"
- set category = "Object"
- set src in oview(1)
- if(usr.stat != 0)
+ for(var/mob/living/carbon/slime/M in range(1,usr))
+ if(M.Victim == usr)
+ usr << "You're too busy getting your life sucked out of you."
return
- if(beaker)
- filtering = 0
- beaker.loc = usr.loc
- beaker = null
- add_fingerprint(usr)
- return
-
- verb/move_inside()
- set name = "Enter Sleeper"
- set category = "Object"
- set src in oview(1)
-
- if(usr.stat != 0 || !(ishuman(usr) || ismonkey(usr)))
- return
-
+ visible_message("[usr] starts climbing into the sleeper.", 3)
+ if(do_after(usr, 20))
if(src.occupant)
usr << "\blue The sleeper is already occupied!"
return
+ usr.stop_pulling()
+ usr.client.perspective = EYE_PERSPECTIVE
+ usr.client.eye = src
+ usr.loc = src
+ update_use_power(2)
+ src.occupant = usr
+ src.icon_state = "sleeper_1"
+ if(orient == "RIGHT")
+ icon_state = "sleeper_1-r"
- for(var/mob/living/carbon/slime/M in range(1,usr))
- if(M.Victim == usr)
- usr << "You're too busy getting your life sucked out of you."
- return
- visible_message("[usr] starts climbing into the sleeper.", 3)
- if(do_after(usr, 20))
- if(src.occupant)
- usr << "\blue The sleeper is already occupied!"
- return
- usr.stop_pulling()
- usr.client.perspective = EYE_PERSPECTIVE
- usr.client.eye = src
- usr.loc = src
- update_use_power(2)
- src.occupant = usr
- src.icon_state = "sleeper_1"
- if(orient == "RIGHT")
- icon_state = "sleeper_1-r"
-
- for(var/obj/O in src)
- del(O)
- src.add_fingerprint(usr)
- return
+ for(var/obj/O in src)
+ del(O)
+ src.add_fingerprint(usr)
return
+ return
+
+
+/obj/machinery/sleeper/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+ if(!allowed_to_add_this_person_to_a_medical_machine(O,user,src,occupant))
+ return
+ var/mob/living/L = O
+ if(L == user)
+ visible_message("[user] starts climbing into the sleeper.", 3)
+ else
+ visible_message("[user] starts putting [L.name] into the sleeper.", 3)
+ if(do_after(user, 20))
+ if(src.occupant)
+ user << "\blue The sleeper is already occupied!"
+ return
+ if(!L) return
+
+ if(L.client)
+ L.client.perspective = EYE_PERSPECTIVE
+ L.client.eye = src
+ L.loc = src
+ src.occupant = L
+ src.icon_state = (orient == "RIGHT") ? "sleeper_1-r" : "sleeper_1"
+ L << "\blue You feel cool air surround you. You go numb as your senses turn inward."
+ src.add_fingerprint(user)
+ if(user.pulling == L)
+ user.pulling = null
+ return
+ return
\ No newline at end of file
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index 16b21a59..fc6d27e5 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -14,8 +14,23 @@
idle_power_usage = 60
active_power_usage = 10000 //10 kW. It's a big all-body scanner.
-/*/obj/machinery/bodyscanner/allow_drop()
- return 0*/
+
+/obj/machinery/bodyscanner/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+ if(!allowed_to_add_this_person_to_a_medical_machine(O,user,src,occupant))
+ return
+ var/mob/living/L = O
+ if(L == user)
+ visible_message("[user] climbs into the body scanner.", 3)
+ else
+ visible_message("[user] puts [L.name] into the body scanner.", 3)
+ if (L.client)
+ L.client.perspective = EYE_PERSPECTIVE
+ L.client.eye = src
+ L.loc = src
+ src.occupant = L
+ src.icon_state = "body_scanner_1"
+ src.add_fingerprint(user)
+ return
/obj/machinery/bodyscanner/relaymove(mob/user as mob)
if (user.stat)
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index d059e310..72533e80 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -370,7 +370,7 @@
T.temperature = 5000
T.hotspot_expose(50000,50000,1)
if(L.name=="Holocarp Spawn")
- new /mob/living/simple_animal/hostile/carp(L.loc)
+ new /mob/living/simple_animal/hostile/carp/hologram(L.loc)
/obj/machinery/computer/HolodeckControl/proc/emergencyShutdown()
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 32ecb748..2c54faed 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -32,6 +32,20 @@
node = target
break
+
+/obj/machinery/atmospherics/unary/cryo_cell/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+ if(!allowed_to_add_this_person_to_a_medical_machine(O,user,src,occupant))
+ return
+ var/mob/living/L = O
+ if(put_mob(L))
+ if(L == user)
+ visible_message("[user] climbs into the cryo cell.", 3)
+ else
+ visible_message("[user] puts [L.name] into the cryo cell.", 3)
+ if(user.pulling == L)
+ user.pulling = null
+
+
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()
if(!node)
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 7143e381..766749e3 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -144,6 +144,7 @@ var/global/list/frozen_items = list()
desc = "A man-sized pod for entering suspended animation."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "body_scanner_0"
+ var/occupied_icon_state = "body_scanner_1"
density = 1
anchored = 1
@@ -288,7 +289,6 @@ var/global/list/frozen_items = list()
del(occupant)
occupant = null
-
return
@@ -327,9 +327,9 @@ var/global/list/frozen_items = list()
M.client.eye = src
if(orient_right)
- icon_state = "body_scanner_1-r"
+ icon_state = "[occupied_icon_state]-r"
else
- icon_state = "body_scanner_1"
+ icon_state = occupied_icon_state
M << "\blue You feel cool air surround you. You go numb as your senses turn inward."
M << "\blue If you ghost, log out or close your client now, your character will shortly be permanently removed from the round."
@@ -345,6 +345,72 @@ var/global/list/frozen_items = list()
//Despawning occurs when process() is called with an occupant without a client.
src.add_fingerprint(M)
+
+
+/obj/machinery/cryopod/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
+ if(!allowed_to_add_this_person_to_a_medical_machine(O,user,src,occupant))
+ return
+
+ var/mob/living/L = O
+
+ if(L.stat == DEAD)
+ user << "Dead people can not be put into cryo."
+ return
+
+ for(var/mob/living/carbon/slime/M in range(1,L))
+ if(M.Victim == L)
+ usr << "[L.name] will not fit into the cryo pod because they have a slime latched onto their head."
+ return
+
+ var/willing = null //We don't want to allow people to be forced into despawning.
+
+ if(L.client)
+ if(alert(L,"Would you like to enter cryosleep?",,"Yes","No") == "Yes")
+ if(!L) return
+ willing = 1
+ else
+ willing = 1
+
+ if(willing)
+ if(L == user)
+ visible_message("[user] starts climbing into the cryo pod.", 3)
+ else
+ visible_message("[user] starts putting [L] into the cryo pod.", 3)
+
+ if(do_after(user, 20))
+ if(!L) return
+
+ L.loc = src
+
+ if(L.client)
+ L.client.perspective = EYE_PERSPECTIVE
+ L.client.eye = src
+ else
+ user << "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]"
+ return
+
+ if(orient_right)
+ icon_state = "[occupied_icon_state]-r"
+ else
+ icon_state = occupied_icon_state
+
+ L << "\blue You feel cool air surround you. You go numb as your senses turn inward."
+ L << "\blue If you ghost, log out or close your client now, your character will shortly be permanently removed from the round."
+ occupant = L
+ time_entered = world.time
+
+ // Book keeping!
+ var/turf/location = get_turf(src)
+ log_admin("[key_name_admin(L)] has entered a stasis pod.")
+ message_admins("\blue [key_name_admin(L)] has entered a stasis pod.(JMP)")
+ message_mods("\blue [key_name_admin(L)] has entered a stasis pod.(JMP)")
+
+ //Despawning occurs when process() is called with an occupant without a client.
+ src.add_fingerprint(L)
+
+ return
+
+
/obj/machinery/cryopod/verb/eject()
set name = "Eject Pod"
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index fe9e8cf1..82b680b3 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -16,7 +16,7 @@
var/locked = 1
attack_self(mob/user as mob)
- if (!ishuman(user) && !istype(user,/mob/living/silicon/robot/drone))
+ if (!ishuman(user) && !istype(user,/mob/living/silicon/robot))
return ..(user)
var/mob/living/carbon/human/H = user
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index f9fa55ba..80eeb962 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -707,6 +707,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
var/obj/item/device/encryptionkey/keyslot = null//Borg radios can handle a single encryption key
icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
icon_state = "radio"
+ var/emagged = 0 // getting emagged gives you the syndicate channels and access to the external speaker
+ var/external_speakers = TRUE
/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
// ..()
@@ -749,9 +751,12 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
return
+/obj/item/device/radio/borg/proc/update_speaker_range()
+ canhear_range = external_speakers ? 3 : 0 // if your speakers are on, people can hear you, if not, they can't
+
/obj/item/device/radio/borg/proc/recalculateChannels()
src.channels = list()
- src.syndie = 0
+ src.syndie = FALSE
var/mob/living/silicon/robot/D = src.loc
if(D.module)
@@ -760,30 +765,29 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
continue
src.channels += ch_name
src.channels[ch_name] += D.module.channels[ch_name]
+ if(emagged) // emagged cyborgs get the syndicate channel
+ src.channels["Syndicate"]=TRUE
+ src.syndie = TRUE
+ update_speaker_range()
if(keyslot)
for(var/ch_name in keyslot.channels)
if(ch_name in src.channels)
continue
src.channels += ch_name
src.channels[ch_name] += keyslot.channels[ch_name]
-
if(keyslot.syndie)
- src.syndie = 1
-
-
+ src.syndie = TRUE
for (var/ch_name in src.channels)
if(!radio_controller)
sleep(30) // Waiting for the radio_controller to be created.
if(!radio_controller)
src.name = "broken radio"
return
-
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
-
return
/obj/item/device/radio/borg/Topic(href, href_list)
- if(usr.stat || !on)
+ if (usr.stat || !on)
return
if (href_list["mode"])
if(subspace_transmission != 1)
@@ -796,6 +800,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
channels = list()
else
recalculateChannels()
+ if (href_list["external_speakers"])
+ external_speakers = !external_speakers
..()
/obj/item/device/radio/borg/interact(mob/user as mob)
@@ -803,8 +809,12 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
return
var/dat = "[src]"
+ var/external_speaker_line = "" // external speakers
+ if (emagged)
+ external_speaker_line = "External Speakers: " + (external_speakers ? "Engaged" : "Disengaged") + "
"
dat += {"
- Speaker: [listening ? "Engaged" : "Disengaged"]
+ Internal Speaker: [listening ? "Engaged" : "Disengaged"]
+ [external_speaker_line]
Frequency:
-
-
@@ -822,6 +832,11 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
onclose(user, "radio")
return
+
+/obj/item/device/radio/borg/proc/set_emag(var/is_emagged)
+ emagged=is_emagged
+ recalculateChannels()
+
/obj/item/device/radio/proc/config(op)
if(radio_controller)
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index f1dc4bf4..6e2ed3c4 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -1048,7 +1048,6 @@
-
- Author's Foreword
@@ -1060,7 +1059,7 @@
- Or: What the fuck does a "passive gate" do?
+ Or: What the fuck does a "pressure regulator" do?
Alright. It has come to my attention that a variety of people are unsure of what a "pipe" is and what it does.
Apparently, there is an unnatural fear of these arcane devices and their "gases." Spooky, spooky. So,
@@ -1085,6 +1084,8 @@
Manual T-valve: Like a manual valve, but at the center of a manifold instead of a straight pipe.
+ An important note here is that pipes are now done in three distinct lines - general, supply, and scrubber. You can move gases between these with a universal adapter. Use the correct position for the correct location.
+ Connecting scrubbers to a supply position pipe makes you an idiot who gives everyone a difficult job. Insulated and HE pipes don't go through these positions.
Bent pipes: Pipes with a 90 degree bend at the half-meter mark. My goodness.
Pipe manifolds: Pipes that are essentially a "T" shape, allowing you to connect three things at one point.
@@ -1101,43 +1102,36 @@
They actually do something.
This is usually where people get frightened, afraid, and start calling on their gods and/or cowering in fear. Yes, I can see you doing that right now.
Stop it. It's unbecoming. Most of these are fairly straightforward.
-
- - Gas pump: Take a wild guess. It moves gas in the direction it's pointing (marked by the red line on one end). It moves it based on pressure, the maximum output being 4500 kPa (kilopascals).
+
- Gas pump: Take a wild guess. It moves gas in the direction it's pointing (marked by the red line on one end). It moves it based on pressure, the maximum output being 15000 kPa (kilopascals).
Ordinary atmospheric pressure, for comparison, is 101.3 kPa, and the minimum pressure of room-temperature pure oxygen needed to not suffocate in a matter of minutes is 16 kPa
- (though 18 kPa is preferred using internals, for various reasons).
- - Volume pump: This pump goes based on volume, instead of pressure, and the possible maximum pressure it can create in the pipe on the receiving end is double the gas pump because of this,
- clocking in at an incredible 9000 kPa. If a pipe with this is destroyed or damaged, and this pressure of gas escapes, it can be incredibly dangerous depending on the size of the pipe filled.
- Don't hook this to the distribution loop, or you will make babies cry and the Chief Engineer brutally beat you.
- - Passive gate: This is essentially a cap on the pressure of gas allowed to flow in a specific direction.
- When turned on, instead of actively pumping gas, it measures the pressure flowing through it, and whatever pressure you set is the maximum: it'll cap after that.
- In addition, it only lets gas flow one way. The direction the gas flows is opposite the red handle on it, which is confusing to people used to the red stripe on pumps pointing the way.
+ (though 18 kPa is preferred when using internals with pure oxygen, for various reasons). A high-powered variant will move gas more quickly at the expense of consuming more power. Do not turn the distribution loop up to 15000 kPa.
+ You will make engiborgs cry and the Chief Engineer will beat you.
+ - Pressure regulator: These replaced the old passive gates. You can choose to regulate pressure by input or output, and regulate flow rate. Regulating by input means that when input pressure is above the limit, gas will flow.
+ Regulating by output means that when pressure is below the limit, gas will flow. Flow rate can be controlled.
- Unary vent: The basic vent used in rooms. It pumps gas into the room, but can't suck it back out. Controlled by the room's air alarm system.
- Scrubber: The other half of room equipment. Filters air, and can suck it in entirely in what's called a "panic siphon." Activating a panic siphon without very good reason will kill someone. Don't do it.
- Meter: A little box with some gauges and numbers. Fasten it to any pipe or manifold and it'll read you the pressure in it. Very useful.
- - Gas mixer: Two sides are input, one side is output. Mixes the gases pumped into it at the ratio defined. The side perpendicular to the other two is "node 2," for reference.
- Can output this gas at pressures from 0-4500 kPa.
+ - Gas mixer: Two sides are input, one side is output. Mixes the gases pumped into it at the ratio defined. The side perpendicular to the other two is "node 2," for reference, on non-mirrored mixers..
+ Output is controlled by flow rate. There is also an "omni" variant that allows you to set input and output sections freely..
- Gas filter: Essentially the opposite of a gas mixer. One side is input. The other two sides are output. One gas type will be filtered into the perpendicular output pipe,
- the rest will continue out the other side. Can also output from 0-4500 kPa.
+ the rest will continue out the other side. Can also output from 0-4500 kPa. The "omni" vairant allows you to set input and output sections freely.
-
Will not set you on fire.
These systems are used to only transfer heat between two pipes. They will not move gases or any other element, but will equalize the temperature (eventually). Note that because of how gases work (remember: pv=nRt),
a higher temperature will raise pressure, and a lower one will lower temperature.
-
Pipe: This is a pipe that will exchange heat with the surrounding atmosphere. Place in fire for superheating. Place in space for supercooling.
Bent pipe: Take a wild guess.
Junction: The point where you connect your normal pipes to heat exchange pipes. Not necessary for heat exchangers, but necessary for H/E pipes/bent pipes.
Heat exchanger: These funky-looking bits attach to an open pipe end. Put another heat exchanger directly across from it, and you can transfer heat across two pipes without having to have the gases touch.
- This normally shouldn't exchange with the ambient air, despite being totally exposed. Just don't ask questions...
-
+ This normally shouldn't exchange with the ambient air, despite being totally exposed. Just don't ask questions.
That's about it for pipes. Go forth, armed with this knowledge, and try not to break, burn down, or kill anything. Please.
+
"}
-
/obj/item/weapon/book/manual/evaguide
name = "EVA Gear and You: Not Spending All Day Inside"
icon_state = "evabook"
@@ -1158,16 +1152,15 @@
Or: How not to suffocate because there's a hole in your shoes
-
- A foreword on using EVA gear
- Donning a Civilian Suit
- Putting on a Hardsuit
+ - Cyclers and Other Modification Equipment
- Final Checks
-
EVA gear. Wonderful to use. It's useful for mining, engineering, and occasionally just surviving, if things are that bad. Most people have EVA training,
but apparently there are some on a space station who don't. This guide should give you a basic idea of how to use this gear, safely. It's split into two sections:
Civilian suits and hardsuits.
@@ -1185,6 +1178,7 @@
There is a small slot on the side of the suit where an emergency oxygen tank or extended emergency oxygen tank will fit,
but it is recommended to have a full-sized tank on your back for EVA.
+ These suits tend to be wearable by most species. They're large and flexible. They might be pretty uncomfortable for some, though, so keep that in mind.
Heavy, uncomfortable, still the best option.
These suits come in Engineering, Mining, and the Armory. There's also a couple Medical Hardsuits in EVA. These provide a lot more protection than the standard suits.
@@ -1194,15 +1188,28 @@
and then is screwed in for one and a quarter full rotations clockwise, leaving the faceplate directly in front of you. There is a small button on the right side of the helmet that activates the helmet light.
The tanks that fasten onto the side slot are emergency tanks, as well as full-sized oxygen tanks, leaving your back free for a backpack or satchel.
+ These suits generally only fit one species. Nanotrasen's are usually human-fitting by default, but there's equipment that can make modifications to the hardsuits to fit them to other species.
+
+
+ How to actually make hardsuits fit you.
+ There's a variety of equipment that can modify hardsuits to fit species that can't fit into them, making life quite a bit easier.
+
+ The first piece of equipment is a suit cycler. This is a large machine resembling the storage pods that are in place in some places. These are machines that will automatically tailor a suit to certain specifications.
+ The largest uses of them are for their cleaning functions and their ability to tailor suits for a species. Do not enter them physically. You will die from any of the functions being activated, and it will be painful.
+ These machines can both tailor a suit between species, and between types. This means you can convert engineering hardsuits to atmospherics, or the other way. This is useful. Use it if you can.
+
+ Suit cooling units are useful for people who need to go into fires. Any suits except for atmospherics' hardsuits aren't designed to handle high heat situations, so this will be necessary. It's also useful for IPCs, who find heat rather than oxygen the largest issue in vacuum.
+
+ There's also modification kits that let you modify suits yourself. These are extremely difficult to use unless you understand the actual construction of the suit. I do not reccomend using them unless no other option is available.
- Are all seals fastened correctly?
+ - If you have modified it manually, is absolutely everything sealed perfectly?
- Do you either have shoes on under the suit, or magnetic boots on over it?
- Do you have a mask on and internals on the suit or your back?
- Do you have a way to communicate with the station in case something goes wrong?
- Do you have a second person watching if this is a training session?
-
If you don't have any further issues, go out and do whatever is necessary.
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 8165a4eb..ba841e52 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -349,8 +349,8 @@
if ((!( istype(O, /obj/item/weapon) ) || user.get_active_hand() != O))
return ..()
- if(isrobot(user))
- return
+ if(istype(user, /mob/living/silicon/robot/drone)) // drones don't get to table people
+ return ..()
user.drop_item()
if (O.loc != src.loc)
step(O, get_dir(O, src))
diff --git a/code/modules/aurora/sqlnews_controller.dm b/code/modules/aurora/sqlnews_controller.dm
index f6c3a6ce..b11b28d9 100644
--- a/code/modules/aurora/sqlnews_controller.dm
+++ b/code/modules/aurora/sqlnews_controller.dm
@@ -45,7 +45,7 @@ datum/sqlnews/proc/update() //Updates the stored variables and preppes it for a
fails++
return
- var/DBQuery/query = dbcon.NewQuery("SELECT id, publishtime FROM ss13_news WHERE isnull(notpublishing) ORDER BY publishtime ASC LIMIT [count],1")
+ var/DBQuery/query = dbcon.NewQuery("SELECT id, publishtime FROM ss13_news WHERE status = '2' ORDER BY publishtime ASC LIMIT [count],1")
query.Execute()
if(!query.RowCount())
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 5e1d8a3a..b7df2c49 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -76,6 +76,27 @@
if(target)
ManualFollow(target)
+ if (href_list["follow"])
+ var/atom/target = locate(href_list["follow"])
+ if(target)
+ ManualFollow(target)
+
+ if (href_list["jump"])
+ var/mob/target = locate(href_list["jump"])
+ var/mob/A = usr;
+ A << "Teleporting to [target]..."
+ if(target && target != usr)
+ spawn(0)
+ var/turf/pos = get_turf(A)
+ var/turf/T=get_turf(target)
+ if(T != pos)
+ if(!T)
+ return
+ if(!client)
+ return
+ loc = T
+ following = null
+ ..()
/mob/dead/attackby(obj/item/W, mob/user)
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 921aa630..faf8c7bf 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -11,6 +11,7 @@
construction_time = 75
var/searching = 0
var/askDelay = 10 * 60 * 1
+ var/list/ghost_volunteers[0]
req_access = list(access_robotics)
locked = 0
mecha = null//This does not appear to be used outside of reference in mecha.dm.
@@ -23,31 +24,36 @@
//Start the process of searching for a new user.
user << "\blue You carefully locate the manual activation switch and start the positronic brain's boot process."
icon_state = "posibrain-searching"
+ ghost_volunteers.Cut()
src.searching = 1
src.request_player()
- spawn(600) reset_search()
-
+ spawn(600)
+ if(ghost_volunteers.len)
+ var/mob/dead/observer/O = pick(ghost_volunteers)
+ if(istype(O) && O.client && O.key)
+ transfer_personality(O)
+ reset_search()
+
/obj/item/device/mmi/posibrain/proc/request_player()
for(var/mob/dead/observer/O in player_list)
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
- continue
- if(jobban_isbanned(O, "pAI"))
- continue
- if(O.client)
- if(O.client.prefs.be_special & BE_PAI)
- question(O.client)
-
-/obj/item/device/mmi/posibrain/proc/question(var/client/C)
- spawn(0)
- if(!C) return
- var/response = alert(C, "Someone is requesting a personality for a positronic brain. Would you like to play as one?", "Positronic brain request", "Yes", "No", "Never for this round")
- if(!C || brainmob.key || 0 == searching) return //handle logouts that happen whilst the alert is waiting for a response, and responses issued after a brain has been located.
- if(response == "Yes")
- transfer_personality(C.mob)
- else if (response == "Never for this round")
- C.prefs.be_special ^= BE_PAI
+ if(check_observer(O))
+ O << "\blue