Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13

_maps/map_files/BoxStation/BoxStation.dmm

@@ -3236,10 +3236,10 @@
 "bkl" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
 "bkm" = (/turf/open/floor/plasteel/white,/area/science/robotics/lab)
 "bkn" = (/obj/structure/chair/office/light{dir = 1},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
-"bko" = (/obj/machinery/camera{c_tag = "Robotics Lab"; network = list("ss13","rd")},/obj/machinery/button/door{id = "robotics"; name = "Shutters Control Button"; pixel_x = 6; pixel_y = 24; req_access_txt = "29"},/obj/structure/table,/obj/item/book/manual/wiki/robotics_cyborgs{pixel_x = 2; pixel_y = 5},/obj/item/reagent_containers/glass/beaker/large,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
+"bko" = (/obj/machinery/camera{c_tag = "Robotics Lab"; network = list("ss13","rd")},/obj/structure/table,/obj/item/book/manual/wiki/robotics_cyborgs{pixel_x = 2; pixel_y = 5},/obj/item/reagent_containers/glass/beaker/large,/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/posialert{pixel_y = 28},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
 "bkp" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
 "bkq" = (/obj/structure/chair/stool,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
-"bkr" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
+"bkr" = (/obj/structure/filingcabinet/chestdrawer,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/button/door{id = "robotics"; name = "Shutters Control Button"; pixel_x = 24; req_access_txt = "29"},/turf/open/floor/plasteel/white,/area/science/robotics/lab)
 "bks" = (/obj/structure/closet/emcloset,/obj/effect/turf_decal/stripes/line{dir = 9},/turf/open/floor/plasteel/white,/area/science/research)
 "bkt" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel/white,/area/science/research)
 "bku" = (/obj/machinery/camera{c_tag = "Research Division Access"},/obj/structure/sink{dir = 4; pixel_x = 11},/obj/effect/turf_decal/stripes/line{dir = 5},/turf/open/floor/plasteel/white,/area/science/research)

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -106625,10 +106625,6 @@
 	},
 /turf/open/floor/plating,
 /area/science/robotics/lab)
-"dye" = (
-/obj/structure/sign/departments/science,
-/turf/closed/wall,
-/area/science/robotics/lab)
 "dyf" = (
 /obj/machinery/door/firedoor,
 /obj/structure/cable/white{
@@ -107644,6 +107640,9 @@
 /obj/item/circuitboard/mecha/ripley/main,
 /obj/item/circuitboard/mecha/ripley/peripherals,
 /obj/effect/turf_decal/bot,
+/obj/machinery/posialert{
+	pixel_y = 28
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "dzJ" = (
@@ -164802,7 +164801,7 @@ dsi
 dtx
 duX
 dwy
-dye
+dyc
 dzI
 dAM
 dCs

_maps/map_files/MetaStation/MetaStation.dmm

@@ -69052,6 +69052,9 @@
 	network = list("ss13","rd")
 	},
 /obj/effect/turf_decal/delivery,
+/obj/machinery/posialert{
+	pixel_y = 28
+	},
 /turf/open/floor/plasteel,
 /area/science/robotics/lab)
 "cDg" = (

_maps/map_files/OmegaStation/OmegaStation.dmm

@@ -2531,7 +2531,7 @@
 "aZX" = (/obj/structure/reagent_dispensers/fueltank,/obj/effect/decal/cleanable/oil,/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/mechbay)
 "baa" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/science/robotics/lab)
 "bab" = (/obj/structure/rack,/obj/item/storage/toolbox/mechanical{pixel_x = -3; pixel_y = 3},/obj/item/storage/toolbox/electrical,/obj/item/screwdriver{pixel_y = 5},/obj/item/multitool,/obj/item/clothing/head/welding,/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/camera{c_tag = "Robotics Lab"; dir = 2; network = list("ss13","rd")},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
-"bad" = (/obj/structure/rack,/obj/item/book/manual/wiki/robotics_cyborgs,/obj/item/storage/belt/utility/full,/obj/item/circuitboard/mecha/ripley/main,/obj/item/circuitboard/mecha/ripley/peripherals,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
+"bad" = (/obj/structure/rack,/obj/item/book/manual/wiki/robotics_cyborgs,/obj/item/storage/belt/utility/full,/obj/item/circuitboard/mecha/ripley/main,/obj/item/circuitboard/mecha/ripley/peripherals,/obj/machinery/light{dir = 1},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/posialert{pixel_y = 28},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
 "baf" = (/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/glass/fifty,/obj/structure/table/reinforced,/obj/item/stack/cable_coil/white,/obj/item/stack/cable_coil/white,/obj/item/assembly/flash/handheld,/obj/item/assembly/flash/handheld,/obj/item/assembly/flash/handheld,/obj/item/assembly/flash/handheld,/obj/item/assembly/flash/handheld,/obj/item/assembly/flash/handheld,/obj/machinery/newscaster{pixel_y = 32},/obj/effect/turf_decal/bot,/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
 "bag" = (/obj/item/paper_bin,/obj/item/assembly/prox_sensor{pixel_x = 5; pixel_y = 7},/obj/item/assembly/prox_sensor{pixel_x = 5; pixel_y = 7},/obj/item/assembly/prox_sensor{pixel_x = 5; pixel_y = 7},/obj/structure/table/reinforced,/obj/machinery/requests_console{department = "Robotics Lab"; departmentType = 0; name = "Robotics RC"; pixel_y = 32; receive_ore_updates = 1},/obj/machinery/light_switch{pixel_x = 24},/obj/effect/turf_decal/bot,/obj/item/clothing/glasses/welding,/obj/item/wrench,/obj/item/stack/sheet/plasteel{amount = 15},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
 "bah" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/closed/wall/r_wall,/area/science/robotics/lab)

_maps/map_files/PubbyStation/PubbyStation.dmm

@@ -2941,7 +2941,7 @@
 "blI" = (/obj/machinery/requests_console{department = "Robotics"; departmentType = 2; name = "Robotics RC"; pixel_y = 30; receive_ore_updates = 1},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/science/robotics/lab)
 "blJ" = (/obj/structure/disposalpipe/sorting/mail/flip{dir = 2; sortType = 14},/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/science/robotics/lab)
 "blK" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/power/apc{dir = 1; name = "Robotics Lab APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-8"},/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 4},/turf/open/floor/plasteel,/area/science/robotics/lab)
-"blL" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
+"blL" = (/obj/machinery/disposal/bin,/obj/structure/disposalpipe/trunk{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/posialert{pixel_y = 28},/turf/open/floor/plasteel/dark,/area/science/robotics/lab)
 "blM" = (/obj/machinery/rnd/server,/obj/structure/sign/poster/random{pixel_y = 32},/turf/open/floor/circuit/telecomms/server,/area/science/server)
 "blN" = (/obj/machinery/light{dir = 1; light_color = "#c1caff"},/obj/structure/sign/poster/random{pixel_y = 32},/turf/open/floor/plasteel/dark/telecomms,/area/science/server)
 "blP" = (/obj/effect/landmark/event_spawn,/obj/item/beacon,/obj/machinery/light{dir = 8},/turf/open/floor/engine,/area/science/explab)

code/datums/ert.dm

@@ -13,7 +13,7 @@
 
 /datum/ert/New()
 	if (!polldesc)
-		polldesc = "a Code [code] Nanotrasen Emergency Response Team"
+		polldesc = "a Code [code] Kinaris Emergency Response Team"
 
 /datum/ert/blue
 	opendoors = FALSE
@@ -54,7 +54,7 @@
 	leader_role = /datum/antagonist/ert/commander/inquisitor
 	rename_team = "Inquisition"
 	mission = "Destroy any traces of paranormal activity aboard the station."
-	polldesc = "a Nanotrasen paranormal response team"
+	polldesc = "a Kinaris paranormal response team"
 
 /datum/ert/greybois
 	code = "Green"

code/game/machinery/posi_alert.dm

@@ -0,0 +1,44 @@
+/obj/machinery/posialert
+	name = "automated positronic alert console"
+	desc = "A console that will ping when a positronic personality is available for download."
+	icon = 'icons/obj/machines/terminals.dmi'
+	icon_state = "posialert"
+	var/inuse = FALSE
+	var/online = TRUE
+
+	var/obj/item/radio/radio
+	var/radio_key = /obj/item/encryptionkey/headset_sci
+	var/science_channel = "Science"
+
+/obj/machinery/posialert/Initialize()
+	. = ..()
+	radio = new(src)
+	radio.keyslot = new radio_key
+	radio.listening = 0
+	radio.recalculateChannels()
+
+/obj/machinery/posialert/Destroy()
+	QDEL_NULL(radio)
+	return ..()
+	
+
+/obj/machinery/posialert/attack_hand(mob/living/user)
+	online = !online
+	to_chat(user, "<span class='warning'>You turn the posi-alert system [online ? "on" : "off"]!</span>")
+	return
+
+/obj/machinery/posialert/attack_ghost(mob/user)
+	. = ..()
+	if(!online)
+		return
+	if(inuse)
+		return
+	inuse = TRUE
+	flick("posialertflash",src)
+	visible_message("There are positronic personalities available!", runechat_popup = TRUE)
+	radio.talk_into(src, "There are positronic personalities available!", science_channel)
+	playsound(loc, 'sound/machines/ping.ogg', 50)
+	addtimer(CALLBACK(src, .proc/liftcooldown), 300)
+
+/obj/machinery/posialert/proc/liftcooldown()
+	inuse = FALSE

code/game/objects/items/storage/boxes.dm

@@ -1168,7 +1168,7 @@
 	illustration = null
 
 /obj/item/storage/box/mre //base MRE type.
-	name = "Nanotrasen MRE Ration Kit Menu 0"
+	name = "Kinaris MRE Ration Kit Menu 0"
 	desc = "A package containing food suspended in an outdated bluespace pocket which lasts for centuries. If you're lucky you may even be able to enjoy the meal without getting food poisoning."
 	icon_state = "mre"
 	illustration = null
@@ -1194,7 +1194,7 @@
 					ENABLE_BITFIELD(S.foodtype, TOXIC)
 
 /obj/item/storage/box/mre/menu1
-	name = "\improper Nanotrasen MRE Ration Kit Menu 1"
+	name = "\improper Kinaris MRE Ration Kit Menu 1"
 
 /obj/item/storage/box/mre/menu1/safe
 	desc = "A package containing food suspended in a bluespace pocket capable of lasting till the end of time."
@@ -1209,7 +1209,7 @@
 	new /obj/item/tank/internals/emergency_oxygen(src)
 
 /obj/item/storage/box/mre/menu2
-	name = "\improper Nanotrasen MRE Ration Kit Menu 2"
+	name = "\improper Kinaris MRE Ration Kit Menu 2"
 
 /obj/item/storage/box/mre/menu2/safe
 	spawner_chance = 0
@@ -1224,7 +1224,7 @@
 	new /obj/item/tank/internals/emergency_oxygen(src)
 
 /obj/item/storage/box/mre/menu3
-	name = "\improper Nanotrasen MRE Ration Kit Menu 3"
+	name = "\improper Kinaris MRE Ration Kit Menu 3"
 	desc = "The holy grail of MREs. This item contains the fabled MRE pizza, spicy nachos and a sample of coffee instant type 2. Any NT employee lucky enough to get their hands on one of these is truly blessed."
 	icon_state = "menu3"
 	can_expire = FALSE //always fresh, never expired.
@@ -1239,7 +1239,7 @@
 	new /obj/item/tank/internals/emergency_oxygen(src)
 
 /obj/item/storage/box/mre/menu4
-	name = "\improper Nanotrasen MRE Ration Kit Menu 4"
+	name = "\improper Kinaris MRE Ration Kit Menu 4"
 
 /obj/item/storage/box/mre/menu4/safe
 	spawner_chance = 0

code/modules/cargo/bounties/science.dm

@@ -1,24 +1,24 @@
 /datum/bounty/item/science/boh
 	name = "Bag of Holding"
-	description = "Nanotrasen would make good use of high-capacity backpacks. If you have any, please ship them."
+	description = "Centcom would make good use of high-capacity backpacks. If you have any, please ship them."
 	reward = 10000
 	wanted_types = list(/obj/item/storage/backpack/holding)
 
 /datum/bounty/item/science/tboh
 	name = "Trash Bag of Holding"
-	description = "Nanotrasen would make good use of high-capacity trash bags. If you have any, please ship them."
+	description = "Centcom would make good use of high-capacity trash bags. If you have any, please ship them."
 	reward = 10000
 	wanted_types = list(/obj/item/storage/backpack/holding)
 
 /datum/bounty/item/science/bluespace_syringe
 	name = "Bluespace Syringe"
-	description = "Nanotrasen would make good use of high-capacity syringes. If you have any, please ship them."
+	description = "Centcom would make good use of high-capacity syringes. If you have any, please ship them."
 	reward = 10000
 	wanted_types = list(/obj/item/reagent_containers/syringe/bluespace)
 
 /datum/bounty/item/science/bluespace_body_bag
 	name = "Bluespace Body Bag"
-	description = "Nanotrasen would make good use of high-capacity body bags. If you have any, please ship them."
+	description = "Centcom would make good use of high-capacity body bags. If you have any, please ship them."
 	reward = 10000
 	wanted_types = list(/obj/item/bodybag/bluespace)
 

code/modules/cargo/bounties/special.dm

@@ -1,6 +1,6 @@
 /datum/bounty/item/alien_organs
 	name = "Alien Organs"
-	description = "Nanotrasen is interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated."
+	description = "Various research divisions are interested in studying Xenomorph biology. Ship a set of organs to be thoroughly compensated."
 	reward = 25000
 	required_count = 3
 	wanted_types = list(/obj/item/organ/brain/alien, /obj/item/organ/alien, /obj/item/organ/body_egg/alien_embryo)
@@ -21,7 +21,7 @@
 
 /datum/bounty/item/adamantine
 	name = "Adamantine"
-	description = "Nanotrasen's anomalous materials division is in desparate need for Adamantine. Send them a large shipment and we'll make it worth your while."
+	description = "Centcom's anomalous materials division is in desparate need for Adamantine. Send them a large shipment and we'll make it worth your while."
 	reward = 35000
 	required_count = 10
 	wanted_types = list(/obj/item/stack/sheet/mineral/adamantine)

code/modules/client/preferences.dm

@@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	//backgrounds
 	var/mutable_appearance/character_background
 	var/icon/bgstate = "steel"
-	var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
+	var/list/bgstate_options = list("000", "midgrey", "hiro", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
 
 	var/show_mismatched_markings = FALSE //determines whether or not the markings lists should show markings that don't match the currently selected species. Intentionally left unsaved.
 

code/modules/jobs/job_types/captain.dm

@@ -9,7 +9,7 @@ Captain
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
-	supervisors = "Nanotrasen officials and Space law"
+	supervisors = "Kinaris officials and Space law"
 	selection_color = "#ccccff"
 	req_admin_notify = 1
 	minimal_player_age = 5

modular_citadel/code/modules/clothing/suits/suits.dm

@@ -16,7 +16,7 @@
 /obj/item/clothing/suit/hooded/cloak/david
 	name = "red cloak"
 	icon_state = "goliath_cloak"
-	desc = "Ever wanted to look like a badass without ANY effort? Try this nanotrasen brand red cloak, perfect for kids"
+	desc = "Ever wanted to look like a badass without ANY effort? Try this red cloak, perfect for kids"
 	hoodtype = /obj/item/clothing/head/hooded/cloakhood/david
 	body_parts_covered = CHEST|GROIN|ARMS
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
@@ -24,7 +24,7 @@
 /obj/item/clothing/head/hooded/cloakhood/david
 	name = "red cloak hood"
 	icon_state = "golhood"
-	desc = "conceal your face in shame with this nanotrasen brand hood"
+	desc = "conceal your face in shame with this."
 	flags_inv = HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
 	mutantrace_variation = NO_MUTANTRACE_VARIATION
 

tgstation.dme

@@ -608,6 +608,7 @@
 #include "code\game\machinery\navbeacon.dm"
 #include "code\game\machinery\newscaster.dm"
 #include "code\game\machinery\PDApainter.dm"
+#include "code\game\machinery\posi_alert.dm"
 #include "code\game\machinery\quantum_pad.dm"
 #include "code\game\machinery\recharger.dm"
 #include "code\game\machinery\rechargestation.dm"