| [Bot.hacked ? "(!) [Bot.name]" : Bot.name] ([Bot.model]) | "
//If the bot is on, it will display the bot's current mode status. If the bot is not mode, it will just report "Idle". "Inactive if it is not on at all.
@@ -1136,3 +1133,18 @@ var/list/ai_verbs_default = list(
eyeobj.setLoc(get_turf(C))
client.eye = eyeobj
return 1
+
+/mob/living/silicon/ai/proc/relay_speech(mob/living/M, text, verb, datum/language/speaking)
+ if(!say_understands(M, speaking))//The AI will be able to understand most mobs talking through the holopad.
+ if(speaking)
+ text = speaking.scramble(text)
+ else
+ text = stars(text)
+ var/name_used = M.GetVoice()
+ //This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
+ var/rendered
+ if(speaking)
+ rendered = "Relayed Speech: [name_used] [speaking.format_message(text, verb)]"
+ else
+ rendered = "Relayed Speech: [name_used] [verb], \"[text]\""
+ show_message(rendered, 2)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 00435fdd17a..71a2e6cba36 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -116,3 +116,7 @@
return //won't work if dead
acceleration = !acceleration
to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
+
+/mob/camera/aiEye/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "", var/italics = 0, var/mob/speaker = null, var/sound/speech_sound, var/sound_vol)
+ if(relay_speech)
+ ai.relay_speech(speaker, message, verb, language)
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index f82db9b4662..6599c31c5ce 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -152,10 +152,7 @@
health = 100
stat = CONSCIOUS
else
- if(fire_res_on_core)
- health = 100 - getOxyLoss() - getToxLoss() - getBruteLoss()
- else
- health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+ health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
diag_hud_set_status()
diag_hud_set_health()
diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm
index 6d4c3a45150..adc0e54e661 100644
--- a/code/modules/mob/living/silicon/pai/software_modules.dm
+++ b/code/modules/mob/living/silicon/pai/software_modules.dm
@@ -123,6 +123,7 @@
on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
var/data[0]
+ data_core.get_manifest_json()
data["manifest"] = PDA_Manifest
ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
@@ -499,8 +500,7 @@
/mob/living/silicon/pai/proc/hackloop()
var/turf/T = get_turf_or_move(src.loc)
for(var/mob/living/silicon/ai/AI in player_list)
- // TODO: Tie into space manager
- if(!T || !(T.z in config.contact_levels))
+ if(!T || !is_station_contact(T.z))
break
if(T.loc)
to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].")
diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm
index a770f6b1c32..b6cda2e0e3c 100644
--- a/code/modules/mob/living/simple_animal/hostile/illusion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm
@@ -53,6 +53,7 @@
return
var/mob/living/simple_animal/hostile/illusion/M = new(loc)
M.faction = faction.Copy()
+ M.attack_sound = attack_sound
M.Copy_Parent(parent_mob, 80, health/2, melee_damage_upper, multiply_chance/2)
M.GiveTarget(L)
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index c0616bc5eea..ac9b8562681 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -127,11 +127,12 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
/mob/living/simple_animal/hostile/mimic/copy/Life()
..()
+ if(!target && !ckey) //Objects eventually revert to normal if no one is around to terrorize
+ adjustBruteLoss(1)
for(var/mob/living/M in contents) //a fix for animated statues from the flesh to stone spell
death()
/mob/living/simple_animal/hostile/mimic/copy/death(gibbed)
-
for(var/atom/movable/M in src)
M.loc = get_turf(src)
..()
@@ -186,7 +187,6 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
if(destroy_original)
qdel(O)
return 1
- return
/mob/living/simple_animal/hostile/mimic/copy/DestroySurroundings()
if(destroy_objects)
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index dc0916ee344..cf8a7f05574 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -211,6 +211,7 @@
icobase = H.species.icobase
if(H.species.bodyflags & HAS_TAIL)
coloured_tail = H.species.tail
+ qdel(H)
else
icobase = current_species.icobase
else
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index 50c2bd79143..cb00e6a12b3 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -41,8 +41,7 @@
// Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
// unless it's on the same level as the object it's interacting with.
var/turf/T = get_turf(src_object)
- // TODO: Tie into space manager
- if(!T || !(z == T.z || (T.z in config.player_levels)))
+ if(!T || !(atoms_share_level(src,T) || is_level_reachable(T.z)))
return STATUS_CLOSE
// If an object is in view then we can interact with it
diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm
index 65f5a9299ee..ce89f59947b 100644
--- a/code/modules/nano/modules/crew_monitor.dm
+++ b/code/modules/nano/modules/crew_monitor.dm
@@ -5,8 +5,7 @@
if(..())
return 1
var/turf/T = get_turf(nano_host())
- // TODO: Tie into space manager
- if(!T || !(T.z in config.player_levels))
+ if(!T || !is_level_reachable(T.z))
to_chat(usr, "Unable to establish a connection: You're too far away from the station!")
return 0
if(href_list["track"])
diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm
index 1c407bd223c..30f732f48ae 100644
--- a/code/modules/pda/cart_apps.dm
+++ b/code/modules/pda/cart_apps.dm
@@ -316,8 +316,7 @@
if(shuttle_master.supply.mode == SHUTTLE_CALL)
supplyData["shuttle_moving"] = 1
- // TODO: Tie into space manager
- if(shuttle_master.supply.z != ZLEVEL_STATION)
+ if(!is_station_level(shuttle_master.supply.z))
supplyData["shuttle_loc"] = "station"
else
supplyData["shuttle_loc"] = "centcom"
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 2a8ca83b218..6d7bbc90bd3 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -158,7 +158,7 @@
if(signal.data["done"])
useTC = 1
var/turf/pos = get_turf(P)
- // TODO: Tie into space manager
+ // TODO: Make the radio system cooperate with the space manager
if(pos.z in signal.data["level"])
useTC = 2
//Let's make this barely readable
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index b6eb99eb958..5800747d367 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -170,8 +170,7 @@
apcs -= src
if(malfai && operating)
if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if(src.z == ZLEVEL_STATION)
+ if(is_station_level(src.z))
ticker.mode:apcs--
area.power_light = 0
area.power_equip = 0
@@ -996,8 +995,7 @@
malfai.malfhacking = 0
locked = 1
if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
+ if(is_station_level(src.z)) //if(is_type_in_list(get_area(src), the_station_areas))
ticker.mode:apcs++
if(usr:parent)
src.malfai = usr:parent
@@ -1029,8 +1027,7 @@
if(malfai)
if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
+ if(is_station_level(src.z)) //if(is_type_in_list(get_area(src), the_station_areas))
operating ? ticker.mode:apcs++ : ticker.mode:apcs--
src.update()
@@ -1045,8 +1042,7 @@
if(!malf.can_shunt)
to_chat(malf, "You cannot shunt.")
return
- // TODO: Tie into space manager
- if(!(src.z in config.station_levels))
+ if(!is_station_level(src.z))
return
src.occupier = new /mob/living/silicon/ai(src,malf.laws,null,1)
src.occupier.adjustOxyLoss(malf.getOxyLoss())
@@ -1095,8 +1091,7 @@
/obj/machinery/power/apc/proc/ion_act()
//intended to be exactly the same as an AI malf attack
- // TODO: Tie into space manager
- if(!src.malfhack && (src.z in config.station_levels))
+ if(!src.malfhack && is_station_level(src.z))
if(prob(3))
src.locked = 1
if(src.cell.charge > 0)
@@ -1371,8 +1366,7 @@
/obj/machinery/power/apc/proc/set_broken()
if(malfai && operating)
if(ticker.mode.config_tag == "malfunction")
- // TODO: Tie into space manager
- if((src.z in config.station_levels)) //if(is_type_in_list(get_area(src), the_station_areas))
+ if(is_station_level(src.z)) //if(is_type_in_list(get_area(src), the_station_areas))
ticker.mode:apcs--
stat |= BROKEN
operating = 0
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index ea633c7e78f..6468f813fa6 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -124,8 +124,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
O.main_part = null
qdel(O)
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(0,A)
shake_everyone()
return ..()
@@ -302,8 +301,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
message_admins("The gravity generator was brought online. ([area.name])")
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(1,A)
else
if(gravity_in_level() == 1)
@@ -311,8 +309,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
message_admins("The gravity generator was brought offline with no backup generator. ([area.name])")
for(var/area/A in world)
- // TODO: Tie into space manager
- if(!(A.z in config.station_levels)) continue
+ if(!is_station_level(A.z)) continue
A.gravitychange(0,A)
update_icon()
@@ -380,7 +377,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
shake_camera(M, 15, 1)
M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5)
-// TODO: Tie into space manager
+// TODO: Make the gravity generator cooperate with the space manager
/obj/machinery/gravity_generator/main/proc/gravity_in_level()
var/turf/T = get_turf(src)
if(!T)
@@ -389,7 +386,6 @@ var/const/GRAV_NEEDS_WRENCH = 3
return length(gravity_generators["[T.z]"])
return 0
-// TODO: Tie into space manager
/obj/machinery/gravity_generator/main/proc/update_list()
var/turf/T = get_turf(src.loc)
if(T)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 75f88f9b751..4af4ccaeee4 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -433,8 +433,7 @@
return 1
/obj/machinery/power/smes/proc/ion_act()
- // TODO: Tie into space manager
- if(src.z in config.station_levels)
+ if(is_station_level(src.z))
if(prob(1)) //explosion
for(var/mob/M in viewers(src))
M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index c280fe59903..7b94698f0e9 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -23,8 +23,7 @@
var/turf/T = get_turf(R)
if(!T)
continue
- // TODO: Tie into space manager
- if((T.z in config.admin_levels) || T.z > ZLEVEL_EMPTY)
+ if(!is_teleport_allowed(T.z))
continue
if(R.syndicate == 1)
continue
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index cd562e00a48..0e1b7478cc8 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -276,17 +276,9 @@ obj/item/projectile/kinetic/New()
/obj/item/projectile/beam/wormhole/on_hit(atom/target)
if(ismob(target))
- var/turf/portal_destination = pick(orange(6, src))
- do_teleport(target, portal_destination)
- return ..()
- if(!gun)
- qdel(src)
- gun.create_portal(src)
-
-/obj/item/projectile/beam/wormhole/on_hit(atom/target)
- if(ismob(target))
- var/turf/portal_destination = pick(orange(6, src))
- do_teleport(target, portal_destination)
+ if(is_teleport_allowed(target.z))
+ var/turf/portal_destination = pick(orange(6, src))
+ do_teleport(target, portal_destination)
return ..()
if(!gun)
qdel(src)
diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm
index 5f4dc5b0018..b1f789b7f22 100644
--- a/code/modules/reagents/newchem/drinks.dm
+++ b/code/modules/reagents/newchem/drinks.dm
@@ -201,6 +201,7 @@
result = "uplink"
required_reagents = list("rum" = 1, "vodka" = 1, "tequila" = 1, "whiskey" = 1, "synthanol" = 1)
result_amount = 5
+ mix_message = "The chemicals mix to create a shiny, orange substance."
/datum/reagent/ethanol/synthanol/synthnsoda
name = "Synth 'n Soda"
@@ -216,6 +217,7 @@
result = "synthnsoda"
required_reagents = list("synthanol" = 1, "cola" = 1)
result_amount = 2
+ mix_message = "The chemicals mix to create a smooth, fizzy substance."
/datum/reagent/ethanol/synthanol/synthignon
name = "Synthignon"
@@ -231,5 +233,6 @@
result = "synthignon"
required_reagents = list("synthanol" = 1, "wine" = 1)
result_amount = 2
+ mix_message = "The chemicals mix to create a fine, red substance."
// ROBOT ALCOHOL ENDS
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 262820990c2..a0f1aecb520 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -729,7 +729,7 @@
to_chat(user, "The [src] begins to vibrate!")
spawn(rand(10,30))
var/turf/userturf = get_turf(user)
- if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
+ if(src.loc == user && is_teleport_allowed(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
visible_message("The [src] twists and bends, relocating itself!")
throwSmoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg')
diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm
index 328a19ac034..a7a5162c231 100644
--- a/code/modules/security_levels/security levels.dm
+++ b/code/modules/security_levels/security levels.dm
@@ -37,8 +37,7 @@
CC.post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_green")
@@ -54,8 +53,7 @@
CC.post_status("alert", "outline")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_blue")
@@ -67,8 +65,7 @@
security_level = SEC_LEVEL_RED
var/obj/machinery/door/airlock/highsecurity/red/R = locate(/obj/machinery/door/airlock/highsecurity/red) in world
- // TODO: Tie into space manager
- if(R && (R.z in config.station_levels))
+ if(R && is_station_level(R.z))
R.locked = 0
R.update_icon()
@@ -77,8 +74,7 @@
CC.post_status("alert", "redalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_red")
@@ -90,14 +86,12 @@
if(security_level < SEC_LEVEL_RED)
for(var/obj/machinery/door/airlock/highsecurity/red/R in airlocks)
- // TODO: Tie into space manager
- if((R.z in config.station_levels))
+ if(is_station_level(R.z))
R.locked = 0
R.update_icon()
for(var/obj/machinery/door/airlock/hatch/gamma/H in airlocks)
- // TODO: Tie into space manager
- if((H.z in config.station_levels))
+ if(is_station_level(H.z))
H.locked = 0
H.update_icon()
@@ -106,8 +100,7 @@
CC.post_status("alert", "gammaalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_gamma")
FA.update_icon()
@@ -121,8 +114,7 @@
CC.post_status("alert", "epsilonalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_epsilon")
@@ -135,8 +127,7 @@
CC.post_status("alert", "deltaalert")
for(var/obj/machinery/firealarm/FA in world)
- // TODO: Tie into space manager
- if((FA.z in config.contact_levels))
+ if(is_station_contact(FA.z))
FA.overlays = list()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta")
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 40e7aa05aa0..fe3d059a08a 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -6,7 +6,6 @@
height = 7
/obj/docking_port/mobile/assault_pod/request()
- // TODO: Tie into space manager
if(z == initial(src.z)) //No launching pods that have already launched
return ..()
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 1224f5719b9..89aeb978cdf 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -202,8 +202,7 @@
if(time_left <= 0 && !shuttle_master.emergencyNoEscape)
//move each escape pod to its corresponding transit dock
for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile)
- // TODO: Tie into space manager
- if(M.z == ZLEVEL_STATION) //Will not launch from the mine/planet
+ if(is_station_level(M.z)) //Will not launch from the mine/planet
M.enterTransit()
//now move the actual emergency shuttle to its transit dock
for(var/area/shuttle/escape/E in world)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index f076c7ee977..3451f7fbe08 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -28,7 +28,7 @@
return 1
/obj/docking_port/mobile/supply/canMove()
- if(z == ZLEVEL_STATION)
+ if(is_station_level(z))
return forbidden_atoms_check(areaInstance)
return ..()
@@ -45,7 +45,7 @@
sell()
/obj/docking_port/mobile/supply/proc/buy()
- if(z != ZLEVEL_STATION) //we only buy when we are -at- the station
+ if(!is_station_level(z)) //we only buy when we are -at- the station
return 1
if(!shuttle_master.shoppinglist.len)
@@ -93,7 +93,7 @@
shuttle_master.shoppinglist.Cut()
/obj/docking_port/mobile/supply/proc/sell()
- if(z != ZLEVEL_CENTCOMM) //we only sell when we are -at- centcomm
+ if(z != level_name_to_num(CENTCOMM)) //we only sell when we are -at- centcomm
return 1
var/plasma_count = 0
diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm
index b1afd14bcf5..1c03c3f7039 100644
--- a/code/modules/shuttle/syndicate.dm
+++ b/code/modules/shuttle/syndicate.dm
@@ -30,9 +30,9 @@
/obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list)
if(href_list["move"])
- if(z != ZLEVEL_CENTCOMM)
+ if(z != level_name_to_num(CENTCOMM))
to_chat(usr, "Pods are one way!")
return 0
..()
-#undef SYNDICATE_CHALLENGE_TIMER
\ No newline at end of file
+#undef SYNDICATE_CHALLENGE_TIMER
diff --git a/code/modules/space_management/level_check.dm b/code/modules/space_management/level_check.dm
new file mode 100644
index 00000000000..391f5968c22
--- /dev/null
+++ b/code/modules/space_management/level_check.dm
@@ -0,0 +1,7 @@
+/proc/is_on_level_name(atom/A,name)
+ var/datum/space_level/S = space_manager.get_zlev_by_name(name)
+ return A.z == S.zpos
+
+// For expansion later
+/proc/atoms_share_level(atom/A, atom/B)
+ return A.z == B.z
diff --git a/code/modules/space_management/level_traits.dm b/code/modules/space_management/level_traits.dm
new file mode 100644
index 00000000000..83309c3764f
--- /dev/null
+++ b/code/modules/space_management/level_traits.dm
@@ -0,0 +1,62 @@
+/proc/is_level_reachable(z)
+ return check_level_trait(z, REACHABLE)
+
+/proc/is_station_level(z)
+ return check_level_trait(z, STATION_LEVEL)
+
+/proc/is_station_contact(z)
+ return check_level_trait(z, STATION_CONTACT)
+
+/proc/is_teleport_allowed(z)
+ return !check_level_trait(z, BLOCK_TELEPORT)
+
+/proc/is_admin_level(z)
+ return check_level_trait(z, ADMIN_LEVEL)
+
+/proc/is_away_level(z)
+ return check_level_trait(z, AWAY_LEVEL)
+
+/proc/is_mining_level(z)
+ return check_level_trait(z, ORE_LEVEL)
+
+/proc/is_ai_allowed(z)
+ return check_level_trait(z, AI_OK)
+
+/proc/level_blocks_magic(z)
+ return check_level_trait(z, IMPEDES_MAGIC)
+
+/proc/level_boosts_signal(z)
+ return check_level_trait(z, BOOSTS_SIGNAL)
+
+// Used for the nuke disk, or for checking if players survived through xenos
+/proc/is_secure_level(z)
+ var/secure = check_level_trait(z, STATION_LEVEL)
+ if(!secure)
+ // This is to allow further admin levels later, other than centcomm
+ secure = (z == level_name_to_num(CENTCOMM))
+ return secure
+
+var/list/default_map_traits = MAP_TRANSITION_CONFIG
+/proc/check_level_trait(z, trait)
+ if(z == 0)
+ return 0 // If you're nowhere, you have no traits
+ var/list/trait_list
+ if(space_manager.initialized)
+ var/datum/space_level/S = space_manager.get_zlev(z)
+ trait_list = S.flags
+ else
+ trait_list = default_map_traits[z]
+ trait_list = trait_list["attributes"]
+ return (trait in trait_list)
+
+/proc/levels_by_trait(trait)
+ var/list/result = list()
+ for(var/A in space_manager.z_list)
+ var/datum/space_level/S = space_manager.z_list[A]
+ if(trait in S.flags)
+ result |= S
+ return result
+
+/proc/level_name_to_num(name)
+ var/datum/space_level/S = space_manager.get_zlev_by_name(name)
+ return S.zpos
diff --git a/code/modules/space_management/space_level.dm b/code/modules/space_management/space_level.dm
index 6b7654cd504..085bd89f44b 100644
--- a/code/modules/space_management/space_level.dm
+++ b/code/modules/space_management/space_level.dm
@@ -1,7 +1,7 @@
/datum/space_level
var/name = "Your config settings failed, you need to fix this for the datum space levels to work"
var/zpos = 1
- var/flags = 0 // We'll use this to keep track of whether you can teleport/etc
+ var/flags = list() // We'll use this to keep track of whether you can teleport/etc
// Map transition stuff
var/list/neighbors = list()
@@ -19,8 +19,9 @@
var/dirt_count = 0
var/list/init_list = list()
-/datum/space_level/New(z, name, transition_type = SELFLOOPING)
+/datum/space_level/New(z, name, transition_type = SELFLOOPING, traits = list(BLOCK_TELEPORT))
zpos = z
+ flags = traits
set_linkage(transition_type)
build_space_destination_arrays()
@@ -57,7 +58,8 @@
linkage = transition_type
if(transition_type == SELFLOOPING)
link_to_self() // `link_to_self` is defined in space_transitions.dm
-
+ if(transition_type == UNAFFECTED)
+ reset_connections()
/datum/space_level/proc/resume_init()
if(dirt_count > 0)
diff --git a/code/modules/space_management/space_transition.dm b/code/modules/space_management/space_transition.dm
index 469365e4023..bd254a37b8b 100644
--- a/code/modules/space_management/space_transition.dm
+++ b/code/modules/space_management/space_transition.dm
@@ -20,6 +20,7 @@
var/list/direction_cache = list()
/datum/space_level/proc/link_to_self()
+ reset_connections()
neighbors = list()
var/list/L = list(Z_LEVEL_NORTH,Z_LEVEL_SOUTH,Z_LEVEL_EAST,Z_LEVEL_WEST)
for(var/A in L)
@@ -279,7 +280,7 @@
/datum/spacewalk_grid/proc/get_height()
return 1 + max_y - min_y
-// This function is called repeatedly to build the map
+// This function chooses an available point next to any node in the grid
/datum/spacewalk_grid/proc/get_empty_node()
var/datum/point/P = pick(available_nodes)
if(isnull(P))
@@ -287,6 +288,12 @@
consume_node(P)
return P
+// This function is called repeatedly to build the map
+/datum/spacewalk_grid/proc/add_level(datum/space_level/S)
+ var/datum/point/P = get_empty_node()
+ P.set_space_level(S)
+
+
// This proc substantiates the grid of points used to determine routes between levels
// Separating this from initialization gives us time in which we can add more crosslink z levels
// before we bake in all our connections
@@ -310,7 +317,6 @@
var/datum/spacewalk_grid/point_grid = new
// We do this so we can display the way the levels connect later
linkage_map = point_grid
- var/datum/point/P
// Now, we pop entries in a random order from our list of space levels
// and assign its connections based on the grid
@@ -318,16 +324,10 @@
D = pick(crosslinks)
crosslinks.Remove(D)
// We now choose a point in our imaginary grid adjacent to our current location
- P = point_grid.get_empty_node()
- // Let our z level know where in the imaginary grid it is
- // This will also handle establishing neighborship with other z levels
- P.set_space_level(D)
+ point_grid.add_level(D)
-// A heavy proc - loops through all space turfs and sets its destination
+// Loops through border space turfs and sets its destination
// based on its space level's linkage
-// Takes 0.6 seconds per call on my machine - could have each z level
-// have its own space turf cache, but I don't want to complicate this more
-// than is necessary
/datum/zlev_manager/proc/setup_space_destinations()
var/timer = start_watch()
log_debug("Assigning space turf destinations...")
diff --git a/code/modules/space_management/zlevel_manager.dm b/code/modules/space_management/zlevel_manager.dm
index 8f83c0ab5e4..26607380a37 100644
--- a/code/modules/space_management/zlevel_manager.dm
+++ b/code/modules/space_management/zlevel_manager.dm
@@ -3,9 +3,11 @@ var/global/datum/zlev_manager/space_manager = new
/datum/zlev_manager
// A list of z-levels
var/list/z_list = list()
+ var/list/levels_by_name = list()
var/list/heaps = list()
var/datum/spacewalk_grid/linkage_map
+ var/initialized = 0
// Populate our space level list
// and prepare space transitions
@@ -14,18 +16,24 @@ var/global/datum/zlev_manager/space_manager = new
var/k = 1
// First take care of "Official" z levels, without visiting levels outside of the list
- for(var/A in map_transition_config)
- // `A` is the name
- // `map_transition_config[A]` is the transition type
- z_list["[k]"] = new /datum/space_level(k, A, transition_type = map_transition_config[A])
+ for(var/list/features in map_transition_config)
if(k > world.maxz)
- CRASH("More map transitions defined than existent z levels - [num_official_z_levels]")
+ CRASH("More map attributes pre-defined than existent z levels - [num_official_z_levels]")
+ var/name = features["name"]
+ var/linking = features["linkage"]
+ var/list/attributes = features["attributes"]
+ attributes = attributes.Copy() // Clone the list so it can't be changed on accident
+
+ var/datum/space_level/S = new /datum/space_level(k, name, transition_type = linking, traits = attributes)
+ z_list["[k]"] = S
+ levels_by_name[name] = S
k++
// Then, we take care of unmanaged z levels
// They get the default linkage of SELFLOOPING
for(var/i = k, i <= world.maxz, i++)
z_list["[i]"] = new /datum/space_level(i)
+ initialized = 1
/datum/zlev_manager/proc/get_zlev(z)
@@ -34,6 +42,11 @@ var/global/datum/zlev_manager/space_manager = new
else
return z_list["[z]"]
+/datum/zlev_manager/proc/get_zlev_by_name(A)
+ if(!(A in levels_by_name))
+ throw EXCEPTION("Non-existent z level: '[A]'")
+ return levels_by_name[A]
+
/*
* "Dirt" management
* "Dirt" is used to keep track of whether a z level should automatically have
@@ -88,10 +101,14 @@ var/global/datum/zlev_manager/space_manager = new
// Increments the max z-level by one
// For convenience's sake returns the z-level added
-/datum/zlev_manager/proc/add_new_zlevel(name, linkage = SELFLOOPING)
+/datum/zlev_manager/proc/add_new_zlevel(name, linkage = SELFLOOPING, traits = list(BLOCK_TELEPORT))
+ if(name in levels_by_name)
+ throw EXCEPTION("Name already in use: [name]")
world.maxz++
var/our_z = world.maxz
- z_list["[our_z]"] = new /datum/space_level(our_z,name, transition_type = linkage)
+ var/datum/space_level/S = new /datum/space_level(our_z, name, transition_type = linkage, traits = traits)
+ levels_by_name[name] = S
+ z_list["[our_z]"] = S
return our_z
/datum/zlev_manager/proc/cut_levels_downto(new_maxz)
diff --git a/code/modules/store/store.dm b/code/modules/store/store.dm
index 7d5fc1e527d..d93d56acc41 100644
--- a/code/modules/store/store.dm
+++ b/code/modules/store/store.dm
@@ -48,8 +48,7 @@ var/global/datum/store/centcomm_store=new
/datum/store/proc/reconnect_database()
for(var/obj/machinery/computer/account_database/DB in world)
- // TODO: Tie into space manager
- if((DB.z in config.station_levels))
+ if(is_station_level(DB.z))
linked_db = DB
break
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 8b86a3082d8..a2ee8cc85ca 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -22,8 +22,7 @@
qdel(src)
/obj/item/weapon/ore/bluespace_crystal/proc/blink_mob(var/mob/living/L)
- // TODO: Tie into space manager
- if(L.z in config.admin_levels)
+ if(!is_teleport_allowed(L.z))
src.visible_message("[src]'s fragments begin rapidly vibrating and blink out of existence.")
qdel(src)
return
diff --git a/config/example/config.txt b/config/example/config.txt
index eb44c6d828a..97c979b77f7 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -260,18 +260,6 @@ GHOST_INTERACTION
## Default is "python" on Windows, "/usr/bin/env python2" on UNIX.
#PYTHON_PATH pythonw
-## Defines which Z-levels the station exists on.
-STATION_LEVELS 1
-
-## Defines which Z-levels are used for admin functionality, such as Central Command and the Syndicate Shuttle
-ADMIN_LEVELS 2
-
-## Defines which Z-levels which, for example, a Code Red announcement may affect
-CONTACT_LEVELS 1;5
-
-## Defines all Z-levels a character can typically reach
-PLAYER_LEVELS 1;3;4;5;6;7
-
## Expected round length in minutes
EXPECTED_ROUND_LENGTH 120
diff --git a/config/example/space_levels.txt b/config/example/space_levels.txt
deleted file mode 100644
index d40624bb64d..00000000000
--- a/config/example/space_levels.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Main Station;1;linked
-
-Central Command;2;unlinked
-
-Telecommunications Satellite;3;linked
-
-Engineering Outpost;4;linked
-
-Mining Asteroid;5;linked
-
-Derelicted Station;6;linked
-
-Empty Area;7;linked
\ No newline at end of file
diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css
index dab174587ec..e299fa5a5c5 100644
--- a/goon/browserassets/css/browserOutput.css
+++ b/goon/browserassets/css/browserOutput.css
@@ -283,7 +283,7 @@ h1.alert, h2.alert {color: #000000;}
.bnotice {color: #000099; font-weight: bold;}
.boldnotice {color: #000099; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
-.green {color: #03ff39;}
+.green {color: #03bb39;}
.announce {color: #228b22; font-weight: bold;}
.boldannounce {color: #ff0000; font-weight: bold;}
.greenannounce {color: #00ff00; font-weight: bold;}
diff --git a/html/changelog.html b/html/changelog.html
index c1482dc15da..5214279f440 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,86 @@
-->
+
08 August 2016
+
Ar3nn updated:
+
+ - Telekinesis no longer is subject to meatspace problems
+
+
Chakirski updated:
+
+ - Added animal AI holograms.
+ - .45 Magazine sprites for the M1911 are now longer invisible.
+ - Hoodies no longer look like labcoats while in hand.
+ - Ectoplasm spawns in cult mining rooms instead of an invisible "weapon".
+ - Duffel bag descriptions and names no longer contain "duffle".
+ - Syndicate medical duffel bags can now be seen while in hand.
+
+
Crazylemon64 updated:
+
+ - Adds a "Save" buildmode for admins to preserve their creations for later. This is currently in an early stage, so don't be surprised by errors!
+
+
FlattestGuitar updated:
+
+ - Holy Water will no longer make you stutter for ages if you're not a cultist
+
+
Fox McCloud updated:
+
+ - Fixes Orion Ship message being unheard when held in-hand
+ - Adds headphones into the game as a loadout item
+ - Removes fireproof core malf AI power
+ - upgrade turrets malf AI power CPU reduced from 50 to to 30
+ - Overload machine cost increased from 15 to 20
+ - Override machine cost increased from 15 to 30
+ - can override/overload field generators again
+ - Machine uprisers will slowly die if they aren't attacking someone
+ - Adds in Hostile lockdown malf AI power for 30 CPU
+ - Adds break air and fire alarms malf AI powers for 50 and 25 CPU respectively
+ - AI's no longer have flood mode on air alarms by default
+ - Adds in lip reading malf AI power for 30 CPU
+ - Allows accessories to hypothetically grant armor to their wearer
+ - Greytide spear illusions actually have an attack sound now
+ - fixes the wormhole event being much shorter than intended
+
+
FreeStylaLT updated:
+
+ - Walls now melt when hot
+ - Added actual coated rwalls - you can make them by clicking on an existing rwall with at least 2 plasteel in hand. Has infinite temp resistance.
+ - Replaced all fake coated rwalls with new rwalls in both metastation (where they should be) and boxstation
+ - Bandaging someone no longer stabs your eyes with bright green
+ - Fixed repainted-to-wood metal flooring in courtroom - it's now actually wood
+ - Fixed windoor in witness stand facing the wrong way
+
+
KasparoVy updated:
+
+ - Traitors with the Maroon objective will no longer succeed if their target is in a locker on the shuttle.
+ - Traitors with the Assassination objective will no longer fail if their target is assassinated/borged/debrained but on a Z-level greater than the derelict.
+
+
Krausus updated:
+
+ - Fire will now totally consume you, rather than timidly hiding under your clothes.
+ - Admin freeze overlays should no longer disappear from humans until they're actually unfrozen.
+
+
LittleBigKid2000 updated:
+
+ - Adds cheap sunglasses. They provide no flash protection, but are available in the loadout and clothesmate.
+
+
Pinatacolada updated:
+
+ - Makes the swedish gene spit out weird swedish chars and sounds
+
+
Ty-Omaha updated:
+
+ - Fixes "is too cumbersome to carry in one hand" from showing up to other players.
+
+
Yurivw updated:
+
+ - Condimaster now actually makes bottles. Removed: Unused options in admin secret menu are now removed.
+
+
chopchop1614 updated:
+
+ - fix bluespace crystals exploit
+
+
03 August 2016
Fox McCloud updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 5d754fc7ddf..49c48046292 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2618,3 +2618,67 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Missing limbs will now be grayed out on your health doll.
chopchop1614:
- bugfix: Fixed the C4 labcoat exploding bug
+2016-08-08:
+ Ar3nn:
+ - bugfix: Telekinesis no longer is subject to meatspace problems
+ Chakirski:
+ - rscadd: Added animal AI holograms.
+ - tweak: .45 Magazine sprites for the M1911 are now longer invisible.
+ - tweak: Hoodies no longer look like labcoats while in hand.
+ - tweak: Ectoplasm spawns in cult mining rooms instead of an invisible "weapon".
+ - tweak: Duffel bag descriptions and names no longer contain "duffle".
+ - tweak: Syndicate medical duffel bags can now be seen while in hand.
+ Crazylemon64:
+ - rscadd: Adds a "Save" buildmode for admins to preserve their creations for later.
+ This is currently in an early stage, so don't be surprised by errors!
+ FlattestGuitar:
+ - tweak: Holy Water will no longer make you stutter for ages if you're not a cultist
+ Fox McCloud:
+ - bugfix: Fixes Orion Ship message being unheard when held in-hand
+ - rscadd: Adds headphones into the game as a loadout item
+ - tweak: Removes fireproof core malf AI power
+ - tweak: upgrade turrets malf AI power CPU reduced from 50 to to 30
+ - tweak: Overload machine cost increased from 15 to 20
+ - tweak: Override machine cost increased from 15 to 30
+ - tweak: can override/overload field generators again
+ - tweak: Machine uprisers will slowly die if they aren't attacking someone
+ - rscadd: Adds in Hostile lockdown malf AI power for 30 CPU
+ - rscadd: Adds break air and fire alarms malf AI powers for 50 and 25 CPU respectively
+ - tweak: AI's no longer have flood mode on air alarms by default
+ - rscadd: Adds in lip reading malf AI power for 30 CPU
+ - tweak: Allows accessories to hypothetically grant armor to their wearer
+ - bugfix: Greytide spear illusions actually have an attack sound now
+ - bugfix: fixes the wormhole event being much shorter than intended
+ FreeStylaLT:
+ - rscadd: Walls now melt when hot
+ - rscadd: Added actual coated rwalls - you can make them by clicking on an existing
+ rwall with at least 2 plasteel in hand. Has infinite temp resistance.
+ - tweak: Replaced all fake coated rwalls with new rwalls in both metastation (where
+ they should be) and boxstation
+ - tweak: Bandaging someone no longer stabs your eyes with bright green
+ - bugfix: Fixed repainted-to-wood metal flooring in courtroom - it's now actually
+ wood
+ - bugfix: Fixed windoor in witness stand facing the wrong way
+ KasparoVy:
+ - bugfix: Traitors with the Maroon objective will no longer succeed if their target
+ is in a locker on the shuttle.
+ - bugfix: Traitors with the Assassination objective will no longer fail if their
+ target is assassinated/borged/debrained but on a Z-level greater than the derelict.
+ Krausus:
+ - bugfix: Fire will now totally consume you, rather than timidly hiding under your
+ clothes.
+ - bugfix: Admin freeze overlays should no longer disappear from humans until they're
+ actually unfrozen.
+ LittleBigKid2000:
+ - rscadd: Adds cheap sunglasses. They provide no flash protection, but are available
+ in the loadout and clothesmate.
+ Pinatacolada:
+ - rscadd: Makes the swedish gene spit out weird swedish chars and sounds
+ Ty-Omaha:
+ - tweak: Fixes "is too cumbersome to carry in one hand" from showing up to other
+ players.
+ Yurivw:
+ - bugfix: 'Condimaster now actually makes bottles. Removed: Unused options in admin
+ secret menu are now removed.'
+ chopchop1614:
+ - bugfix: fix bluespace crystals exploit
diff --git a/html/changelogs/AutoChangeLog-pr-5268.yml b/html/changelogs/AutoChangeLog-pr-5268.yml
new file mode 100644
index 00000000000..776b50c2bd3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5268.yml
@@ -0,0 +1,5 @@
+author: Crazylemon64
+delete-after: True
+changes:
+ - bugfix: "Makes teleportation checks more consistent, which will ensure that teleporting in the away mission no longer works."
+ - bugfix: "People on the space ruins level no longer count as dead for assassinate objectives."
diff --git a/html/changelogs/AutoChangeLog-pr-5294.yml b/html/changelogs/AutoChangeLog-pr-5294.yml
deleted file mode 100644
index 0b65b93fabf..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5294.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Yurivw
-delete-after: True
-changes:
- - bugfix: "Condimaster now actually makes bottles.
-Removed: Unused options in admin secret menu are now removed."
diff --git a/html/changelogs/AutoChangeLog-pr-5304.yml b/html/changelogs/AutoChangeLog-pr-5304.yml
deleted file mode 100644
index e069a221019..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5304.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ar3nn
-delete-after: True
-changes:
- - bugfix: "Telekinesis no longer is subject to meatspace problems"
diff --git a/html/changelogs/AutoChangeLog-pr-5307.yml b/html/changelogs/AutoChangeLog-pr-5307.yml
deleted file mode 100644
index ab4ae44c5ab..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5307.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: chopchop1614
-delete-after: True
-changes:
- - bugfix: "fix bluespace crystals exploit"
diff --git a/html/changelogs/AutoChangeLog-pr-5314.yml b/html/changelogs/AutoChangeLog-pr-5314.yml
deleted file mode 100644
index 008c0e991a4..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5314.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Chakirski
-delete-after: True
-changes:
- - rscadd: "Added animal AI holograms."
diff --git a/html/changelogs/AutoChangeLog-pr-5316.yml b/html/changelogs/AutoChangeLog-pr-5316.yml
deleted file mode 100644
index ce7347d2416..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5316.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Crazylemon64
-delete-after: True
-changes:
- - rscadd: "Adds a \"Save\" buildmode for admins to preserve their creations for later. This is currently in an early stage, so don't be surprised by errors!"
diff --git a/html/changelogs/AutoChangeLog-pr-5318.yml b/html/changelogs/AutoChangeLog-pr-5318.yml
deleted file mode 100644
index b5e8a6672af..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5318.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: Chakirski
-delete-after: True
-changes:
- - tweak: ".45 Magazine sprites for the M1911 are now longer invisible."
- - tweak: "Hoodies no longer look like labcoats while in hand."
- - tweak: "Ectoplasm spawns in cult mining rooms instead of an invisible \"weapon\"."
diff --git a/html/changelogs/AutoChangeLog-pr-5324.yml b/html/changelogs/AutoChangeLog-pr-5324.yml
deleted file mode 100644
index 787066361ff..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5324.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Krausus
-delete-after: True
-changes:
- - bugfix: "Fire will now totally consume you, rather than timidly hiding under your clothes."
- - bugfix: "Admin freeze overlays should no longer disappear from humans until they're actually unfrozen."
diff --git a/html/changelogs/AutoChangeLog-pr-5325.yml b/html/changelogs/AutoChangeLog-pr-5325.yml
new file mode 100644
index 00000000000..e7c5b3292b4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5325.yml
@@ -0,0 +1,4 @@
+author: DaveTheHeadcrab
+delete-after: True
+changes:
+ - tweak: "ERT gloves reverted to how they used to be."
diff --git a/html/changelogs/AutoChangeLog-pr-5327.yml b/html/changelogs/AutoChangeLog-pr-5327.yml
deleted file mode 100644
index 31acf5637ac..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5327.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: Chakirski
-delete-after: True
-changes:
- - tweak: "Duffel bag descriptions and names no longer contain \"duffle\"."
- - tweak: "Syndicate medical duffel bags can now be seen while in hand."
diff --git a/html/changelogs/AutoChangeLog-pr-5328.yml b/html/changelogs/AutoChangeLog-pr-5328.yml
deleted file mode 100644
index a1a05400981..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5328.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Pinatacolada
-delete-after: True
-changes:
- - rscadd: "Makes the swedish gene spit out weird swedish chars and sounds"
diff --git a/html/changelogs/AutoChangeLog-pr-5334.yml b/html/changelogs/AutoChangeLog-pr-5334.yml
deleted file mode 100644
index 70d782a6495..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5334.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: FlattestGuitar
-delete-after: True
-changes:
- - tweak: "Holy Water will no longer make you stutter for ages if you're not a cultist"
diff --git a/html/changelogs/AutoChangeLog-pr-5335.yml b/html/changelogs/AutoChangeLog-pr-5335.yml
deleted file mode 100644
index 966191626e5..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5335.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Ty-Omaha
-delete-after: True
-changes:
- - tweak: "Fixes \"is too cumbersome to carry in one hand\" from showing up to other players."
diff --git a/html/changelogs/AutoChangeLog-pr-5344.yml b/html/changelogs/AutoChangeLog-pr-5344.yml
deleted file mode 100644
index 502d5b7841a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5344.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - bugfix: "Fixes Orion Ship message being unheard when held in-hand"
diff --git a/html/changelogs/AutoChangeLog-pr-5346.yml b/html/changelogs/AutoChangeLog-pr-5346.yml
deleted file mode 100644
index b629893f0c1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5346.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: KasparoVy
-delete-after: True
-changes:
- - bugfix: "Traitors with the Maroon objective will no longer succeed if their target is in a locker on the shuttle."
- - bugfix: "Traitors with the Assassination objective will no longer fail if their target is assassinated/borged/debrained but on a Z-level greater than the derelict."
diff --git a/html/changelogs/AutoChangeLog-pr-5348.yml b/html/changelogs/AutoChangeLog-pr-5348.yml
deleted file mode 100644
index 2ab1d83f483..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5348.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: LittleBigKid2000
-delete-after: True
-changes:
- - rscadd: "Adds cheap sunglasses. They provide no flash protection, but are available in the loadout and clothesmate."
diff --git a/html/changelogs/AutoChangeLog-pr-5349.yml b/html/changelogs/AutoChangeLog-pr-5349.yml
deleted file mode 100644
index 276d4ac6ad6..00000000000
--- a/html/changelogs/AutoChangeLog-pr-5349.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: Fox McCloud
-delete-after: True
-changes:
- - rscadd: "Adds headphones into the game as a loadout item"
diff --git a/html/changelogs/AutoChangeLog-pr-5387.yml b/html/changelogs/AutoChangeLog-pr-5387.yml
new file mode 100644
index 00000000000..c7f5aeeea9d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5387.yml
@@ -0,0 +1,4 @@
+author: Alexshreds
+delete-after: True
+changes:
+ - tweak: "pAIs can see the crew manifest again."
diff --git a/html/changelogs/AutoChangeLog-pr-5399.yml b/html/changelogs/AutoChangeLog-pr-5399.yml
new file mode 100644
index 00000000000..a1c8ac36b2c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5399.yml
@@ -0,0 +1,4 @@
+author: taukausanake
+delete-after: True
+changes:
+ - bugfix: "Gives proper mix_messages for Uplink, Synthignon, and Synth 'n Soda drinks"
diff --git a/html/changelogs/AutoChangeLog-pr-5405.yml b/html/changelogs/AutoChangeLog-pr-5405.yml
new file mode 100644
index 00000000000..7a71aa7179e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-5405.yml
@@ -0,0 +1,4 @@
+author: Fethas
+delete-after: True
+changes:
+ - bugfix: "The whitelist will respect addons better, didn't even have to make a ban appeal.."
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 4a41556989a..48d253c16cb 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 25ec0162866..9300bec995d 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/nano/templates/pai_manifest.tmpl b/nano/templates/pai_manifest.tmpl
index 447f7ede7c5..d6827594e35 100644
--- a/nano/templates/pai_manifest.tmpl
+++ b/nano/templates/pai_manifest.tmpl
@@ -4,95 +4,95 @@ code/modules/mob/living/silicon/pai/software_modules.dm
Copy-pasted from pda.tmpl
-->
-
-
- {{if data.manifest.heads}}
- | Command |
|---|
- {{for data.manifest["heads"]}}
- {{if value.rank == "Captain"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sec}}
- | Security |
|---|
- {{for data.manifest["sec"]}}
- {{if value.rank == "Head of Security"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.eng}}
- | Engineering |
|---|
- {{for data.manifest["eng"]}}
- {{if value.rank == "Chief Engineer"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.med}}
- | Medical |
|---|
- {{for data.manifest["med"]}}
- {{if value.rank == "Chief Medical Officer"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sci}}
- | Science |
|---|
- {{for data.manifest["sci"]}}
- {{if value.rank == "Research Director"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.ser}}
- | Service |
|---|
- {{for data.manifest["ser"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.sup}}
- | Supply |
|---|
- {{for data.manifest["sup"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else value.rank == "Quartermaster"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.civ}}
- | Civilian |
|---|
- {{for data.manifest["civ"]}}
- {{if value.rank == "Head of Personnel"}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{else}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/if}}
- {{/for}}
- {{/if}}
- {{if data.manifest.misc}}
- | Misc |
|---|
- {{for data.manifest["misc"]}}
- | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
- {{/for}}
- {{/if}}
-
-
+
+ {{if data.manifest.heads}}
+ | Command |
|---|
+ {{for data.manifest["heads"]}}
+ {{if value.rank == "Captain"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sec}}
+ | Security |
|---|
+ {{for data.manifest["sec"]}}
+ {{if value.rank == "Head of Security"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.eng}}
+ | Engineering |
|---|
+ {{for data.manifest["eng"]}}
+ {{if value.rank == "Chief Engineer"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.med}}
+ | Medical |
|---|
+ {{for data.manifest["med"]}}
+ {{if value.rank == "Chief Medical Officer"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sci}}
+ | Science |
|---|
+ {{for data.manifest["sci"]}}
+ {{if value.rank == "Research Director"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.ser}}
+ | Service |
|---|
+ {{for data.manifest["ser"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.sup}}
+ | Supply |
|---|
+ {{for data.manifest["sup"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else value.rank == "Quartermaster"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.civ}}
+ | Civilian |
|---|
+ {{for data.manifest["civ"]}}
+ {{if value.rank == "Head of Personnel"}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{else}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/if}}
+ {{/for}}
+ {{/if}}
+ {{if data.manifest.misc}}
+ | Misc |
|---|
+ {{for data.manifest["misc"]}}
+ | {{:value.name}} | {{:value.rank}} | {{:value.active}} |
+ {{/for}}
+ {{/if}}
+
+