diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 6a6fa0439b4..9769f6fab74 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -236,7 +236,7 @@
f_name = "some "
else
f_name = "a "
- if(blood_color != "#030303")
+ if(blood_color != COLOR_IPC_BLOOD && blood_color != COLOR_OIL)
f_name += "blood-stained [name][infix]!"
else
f_name += "oil-stained [name][infix]."
diff --git a/code/game/gamemodes/changeling/implements/powers/body.dm b/code/game/gamemodes/changeling/implements/powers/body.dm
index 549c574bcab..a2f3daf37b3 100644
--- a/code/game/gamemodes/changeling/implements/powers/body.dm
+++ b/code/game/gamemodes/changeling/implements/powers/body.dm
@@ -262,9 +262,9 @@
C.SetStunned(0)
C.SetWeakened(0)
C.lying = FALSE
- C.reagents.add_reagent(/singleton/reagent/hyperzine, 0.10) //Certainly this can't be abused. - Geeves
- C.reagents.add_reagent(/singleton/reagent/oxycomorphine, 0.10)
- C.reagents.add_reagent(/singleton/reagent/synaptizine, 0.5) //To counter oxycomorphine's side-effects.
+ C.reagents.add_reagent(/singleton/reagent/hyperzine, 10) //Certainly this can't be abused. - Geeves
+ C.reagents.add_reagent(/singleton/reagent/oxycomorphine, 10)
+ C.reagents.add_reagent(/singleton/reagent/synaptizine, 5) //To counter oxycomorphine's side-effects.
C.update_canmove()
src.verbs -= /mob/proc/changeling_unstun
diff --git a/code/game/gamemodes/changeling/implements/powers/stings.dm b/code/game/gamemodes/changeling/implements/powers/stings.dm
index 3010b32cd8a..bef9fc18e7e 100644
--- a/code/game/gamemodes/changeling/implements/powers/stings.dm
+++ b/code/game/gamemodes/changeling/implements/powers/stings.dm
@@ -69,6 +69,7 @@
changeling.prepared_sting = new datum_path(src, verb_path, required_chems, stealthy)
to_chat(src, SPAN_NOTICE("You prepare to fire the [changeling.prepared_sting.name]."))
+ to_chat(src, SPAN_NOTICE("In order to use a sting, click a mob with an empty hand on harm intent."))
return TRUE
/mob/proc/changeling_hallucinate_sting()
diff --git a/code/game/machinery/autolathe/autolathe.dm b/code/game/machinery/autolathe/autolathe.dm
index 12332914afe..86ce45cb014 100644
--- a/code/game/machinery/autolathe/autolathe.dm
+++ b/code/game/machinery/autolathe/autolathe.dm
@@ -253,6 +253,7 @@
var/obj/item/stack/S = I
S.amount = multiplier
build_item = null
+ I.update_icon()
updateUsrDialog()
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 8a0244dee6b..8875eaca223 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -325,16 +325,16 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
var/rendered
if(speaking)
- rendered = "Holopad received, [name_used] [speaking.format_message(text, verb)]"
+ rendered = "Holopad received, [M.get_accent_icon()] [name_used] [speaking.format_message(text, verb)]"
else
- rendered = "Holopad received, [name_used] [verb], \"[text]\""
+ rendered = "Holopad received, [M.get_accent_icon()] [name_used] [verb], \"[text]\""
master.show_message(rendered, 2)
if(has_established_connection())
var/message
if(speaking)
- message = "Holopad received, [name_used] [speaking.format_message(text, verb)]"
+ message = "Holopad received, [M.get_accent_icon()] [name_used] [speaking.format_message(text, verb)]"
else
- message = "Holopad received, [name_used] [verb], \"[text]\""
+ message = "Holopad received, [M.get_accent_icon()] [name_used] [verb], \"[text]\""
connected_pad.audible_message(message)
connected_pad.last_message = message
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 890c2d6d9f1..dab101cb7e2 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -70,7 +70,8 @@
return ..()
/obj/effect/decal/cleanable/blood/update_icon()
- if(basecolor == "rainbow") basecolor = get_random_colour(1)
+ if(basecolor == "rainbow")
+ basecolor = get_random_colour(1)
color = basecolor
/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
@@ -145,8 +146,8 @@
user.verbs += /mob/living/carbon/human/proc/bloody_doodle
/obj/effect/decal/cleanable/blood/splatter
- random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
- amount = 2
+ random_icon_states = list("mgibbl1", "mgibbl2", "mgibbl3", "mgibbl4", "mgibbl5")
+ amount = 2
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 985707ecc43..596df815208 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -159,7 +159,7 @@ BREATH ANALYZER
var/pulse_result = "normal"
if(H.should_have_organ(BP_HEART))
if(H.status_flags & FAKEDEATH)
- pulse_result = 0
+ pulse_result = "0"
else
pulse_result = H.get_pulse(GETPULSE_TOOL)
pulse_result = "[pulse_result]"
@@ -186,6 +186,8 @@ BREATH ANALYZER
oxygenation_string = "[oxygenation_string]"
if(-(INFINITY) to BLOOD_VOLUME_SURVIVE)
oxygenation_string = "[oxygenation_string]"
+ if(H.status_flags & FAKEDEATH)
+ oxygenation_string = "0% blood oxygenation"
var/blood_pressure_string
switch(H.get_blood_pressure_alert())
diff --git a/code/game/objects/items/weapons/circuitboards/computer/computer.dm b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
index bfe3d3df58c..dae64ede34c 100644
--- a/code/game/objects/items/weapons/circuitboards/computer/computer.dm
+++ b/code/game/objects/items/weapons/circuitboards/computer/computer.dm
@@ -129,6 +129,11 @@
build_path = /obj/machinery/computer/slot_machine
origin_tech = list(TECH_DATA = 2)
+/obj/item/circuitboard/ship/navigation
+ name = T_BOARD("Navigation Console")
+ origin_tech = list(TECH_ENGINEERING = 2)
+ build_path = /obj/machinery/computer/ship/navigation
+
/obj/item/circuitboard/ship/helm
name = T_BOARD("Helm Control Console")
origin_tech = list(TECH_ENGINEERING = 3)
diff --git a/code/modules/mob/animations.dm b/code/modules/mob/animations.dm
index 0c4ee636b68..23e97c98d9d 100644
--- a/code/modules/mob/animations.dm
+++ b/code/modules/mob/animations.dm
@@ -46,33 +46,26 @@ note dizziness decrements automatically in the mob's Life() proc.
/mob/var/is_jittery = 0
/mob/var/jitteriness = 0//Carbon
/mob/proc/make_jittery(var/amount)
- if(!istype(src, /mob/living/carbon/human)) // for the moment, only humans get dizzy
- return
+ return
+/mob/living/carbon/human/make_jittery(amount)
jitteriness = min(1000, jitteriness + amount) // store what will be new value
// clamped to max 1000
- if(jitteriness > 100 && !is_jittery)
+ if(jitteriness > 100 && !is_jittery && stat != DEAD && !(status_flags & FAKEDEATH))
spawn(0)
jittery_process()
-
-// Typo from the oriignal coder here, below lies the jitteriness process. So make of his code what you will, the previous comment here was just a copypaste of the above.
/mob/proc/jittery_process()
- //var/old_x = pixel_x
- //var/old_y = pixel_y
- is_jittery = 1
+ is_jittery = TRUE
while(jitteriness > 100)
-// var/amplitude = jitteriness*(sin(jitteriness * 0.044 * world.time) + 1) / 70
-// pixel_x = amplitude * sin(0.008 * jitteriness * world.time)
-// pixel_y = amplitude * cos(0.008 * jitteriness * world.time)
-
var/amplitude = min(4, jitteriness / 100)
pixel_x = old_x + rand(-amplitude, amplitude)
pixel_y = old_y + rand(-amplitude/3, amplitude/3)
-
+ if(stat == DEAD || (status_flags & FAKEDEATH))
+ break
sleep(1)
//endwhile - reset the pixel offsets to zero
- is_jittery = 0
+ is_jittery = FALSE
pixel_x = old_x
pixel_y = old_y
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index a0297ac284c..55764299148 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -242,12 +242,12 @@
msg += "[get_pronoun("He")] [get_pronoun("has")] engorged veins, which appear a vibrant red!\n"
var/distance = get_dist(user,src)
- if(istype(user, /mob/abstract/observer) || user.stat == 2) // ghosts can see anything
+ if(istype(user, /mob/abstract/observer) || user.stat == DEAD) // ghosts can see anything
distance = 1
- if(src.stat && !(src.species.flags & NO_BLOOD)) // No point checking pulse of a species that doesn't have one.
+ if((src.stat || (status_flags & FAKEDEATH)) && !(src.species.flags & NO_BLOOD)) // No point checking pulse of a species that doesn't have one.
msg += "[get_pronoun("He")] [get_pronoun("is")]n't responding to anything around [get_pronoun("him")] and seems to be unconscious.\n"
- if((stat == DEAD || is_asystole() || src.losebreath) && distance <= 3 || (status_flags & FAKEDEATH))
+ if(distance <= 3 && ((stat == DEAD || is_asystole() || src.losebreath) || (status_flags & FAKEDEATH)))
msg += "[get_pronoun("He")] [get_pronoun("does")] not appear to be breathing.\n"
else if (src.stat)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index b68eddec69b..1d00168ab2c 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1900,7 +1900,7 @@
//Get fluffy numbers
/mob/living/carbon/human/proc/blood_pressure()
if(status_flags & FAKEDEATH)
- return list(Floor(species.bp_base_systolic+rand(-5,5))*0.25, Floor(species.bp_base_disatolic+rand(-5,5)*0.25))
+ return list(Floor(species.bp_base_systolic+rand(-5,5))*0.25, Floor(species.bp_base_disatolic+rand(-5,5))*0.25)
var/blood_result = get_blood_circulation()
return list(Floor((species.bp_base_systolic+rand(-5,5))*(blood_result/100)), Floor((species.bp_base_disatolic+rand(-5,5))*(blood_result/100)))
diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm
index 7ab7efa9fe7..446864a7921 100644
--- a/code/modules/mob/living/carbon/human/human_powers.dm
+++ b/code/modules/mob/living/carbon/human/human_powers.dm
@@ -6,8 +6,7 @@
set desc = "Style your hair."
set category = "IC"
- if(!use_check_and_message())
- to_chat(src, SPAN_WARNING("You can't tie your hair when you are incapacitated!"))
+ if(use_check_and_message())
return
if(h_style)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 2960bebdfd4..a47772e05f2 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -183,6 +183,10 @@ proc/get_radio_key_from_channel(var/channel)
return say_dead(message)
return
+ if(silent)
+ to_chat(src, SPAN_WARNING("You try to speak, but nothing comes out!"))
+ return
+
var/message_mode = parse_message_mode(message, "headset")
var/regex/emote = regex("^(\[\\*^\])\[^*\]+$")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 97d1694512b..d8a72672c38 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -851,7 +851,7 @@
//Wakes the mob up from sleeping
/mob/living/simple_animal/proc/wake_up()
if (stat != DEAD)
- set_stat(UNCONSCIOUS)
+ set_stat(CONSCIOUS)
resting = 0
canmove = 1
wander = 1
diff --git a/code/modules/mob/living/whisper.dm b/code/modules/mob/living/whisper.dm
index e893ef65bf9..ce5a5bc751f 100644
--- a/code/modules/mob/living/whisper.dm
+++ b/code/modules/mob/living/whisper.dm
@@ -21,6 +21,10 @@
to_chat(src, SPAN_DANGER("You're muzzled and cannot speak!"))
return
+ if(silent)
+ to_chat(src, SPAN_WARNING("You try to speak, but nothing comes out!"))
+ return
+
var/had_speaking = !!speaking
speaking = speaking ? speaking : parse_language(message)
diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
index a77d63fb741..728458c516c 100644
--- a/code/modules/modular_computers/computers/modular_computer/core.dm
+++ b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -432,18 +432,18 @@
// TODO: Make pretty much everything use these helpers.
/obj/item/modular_computer/proc/output_notice(var/message, var/message_range)
- message = "[icon2html(src, viewers(message_range, get_turf(src)))][src]: " + message
+ message = "[icon2html(src, viewers(message_range, get_turf(src)))] [src]: " + message
output_message(SPAN_NOTICE(message), message_range)
/obj/item/modular_computer/proc/output_error(var/message, var/message_range)
- message = "[icon2html(src, viewers(message_range, get_turf(src)))][src]: " + message
+ message = "[icon2html(src, viewers(message_range, get_turf(src)))] [src]: " + message
output_message(SPAN_WARNING(message), message_range)
/obj/item/modular_computer/proc/get_notification(var/message, var/message_range = 1, var/atom/source)
if(silent)
return
playsound(get_turf(src), 'sound/machines/twobeep.ogg', 20, 1)
- message = "[icon2html(src, viewers(message_range, get_turf(src)))][src]: [SPAN_DANGER("-!-")] Notification from [source]: " + message
+ message = "[icon2html(src, viewers(message_range, get_turf(src)))] [src]: [SPAN_DANGER("-!-")] Notification from [source]: " + message
output_message(FONT_SMALL(SPAN_BOLD(message)), message_range)
/obj/item/modular_computer/proc/register_account(var/datum/computer_file/program/PRG = null)
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index 64a59001920..c97f9bbcf45 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -236,6 +236,10 @@
/obj/structure/stairs/CollidedWith(atom/movable/A)
// This is hackish but whatever.
var/turf/target = get_step(GetAbove(A), dir)
+ if(!target)
+ return
+ if(target.z > (z + 1)) //Prevents wheelchair fuckery. Basically, you teleport twice because both the wheelchair + your mob collide with the stairs.
+ return
if(target.Enter(A, src))
A.forceMove(target)
if(isliving(A))
diff --git a/code/modules/nano/modules/atmos_control.dm b/code/modules/nano/modules/atmos_control.dm
index cd0be07a783..aaf35af778f 100644
--- a/code/modules/nano/modules/atmos_control.dm
+++ b/code/modules/nano/modules/atmos_control.dm
@@ -18,9 +18,11 @@
else if(req_one_access)
log_debug("\The [src] given an unepxected req_one_access: [req_one_access]")
+ var/datum/computer_file/program/H = host
+ var/obj/computer = H.computer
if(monitored_alarm_ids)
for(var/obj/machinery/alarm/alarm in SSmachinery.processing)
- if(alarm.alarm_id && (alarm.alarm_id in monitored_alarm_ids))
+ if(alarm.alarm_id && (alarm.alarm_id in monitored_alarm_ids) && AreConnectedZLevels(computer.z, alarm.z))
monitored_alarms += alarm
// machines may not yet be ordered at this point
sortTim(monitored_alarms, GLOBAL_PROC_REF(cmp_alarm), FALSE)
diff --git a/code/modules/organs/blood.dm b/code/modules/organs/blood.dm
index cecf9bf6b47..b98e79edc97 100644
--- a/code/modules/organs/blood.dm
+++ b/code/modules/organs/blood.dm
@@ -225,12 +225,15 @@ proc/blood_incompatible(donor,receiver,donor_species,receiver_species)
trace_chems = LAZYACCESS(vessel.reagent_data[/singleton/reagent/blood], "trace_chem") || list()
.["trace_chem"] = trace_chems.Copy()
-proc/blood_splatter(var/target, var/source, var/large, var/spray_dir, var/sourceless_color)
-
+/proc/blood_splatter(var/target, var/source, var/large, var/spray_dir, var/sourceless_color)
var/obj/effect/decal/cleanable/blood/splatter
var/decal_type = /obj/effect/decal/cleanable/blood/splatter
if(sourceless_color == COLOR_OIL)
decal_type = /obj/effect/decal/cleanable/blood/oil/streak
+ if(ishuman(source))
+ var/mob/living/carbon/human/H = source
+ if(H.isSynthetic())
+ decal_type = /obj/effect/decal/cleanable/blood/oil/streak
var/turf/T = get_turf(target)
// Are we dripping or splattering?
diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm
index 4d5adc65c1f..a20158c7947 100644
--- a/code/modules/organs/internal/_internal.dm
+++ b/code/modules/organs/internal/_internal.dm
@@ -45,7 +45,7 @@
icon_state = dead_icon
/obj/item/organ/internal/proc/surgical_fix(mob/user)
- if(damage > min_broken_damage && !(status & ORGAN_ROBOT))
+ if(damage > min_broken_damage)
var/scarring = damage / max_damage
scarring = 1 - 0.5 * scarring ** 2 // Between ~15 and 50 percent loss.
var/new_max_dam = Floor(scarring * max_damage)
diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm
index 3a1dfc14dd2..7c2d6ee3fa9 100644
--- a/code/modules/overmap/ship_weaponry/_ship_gun.dm
+++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm
@@ -327,6 +327,7 @@
icon_screen = "teleport"
icon_keyboard = "teal_key"
light_color = LIGHT_COLOR_CYAN
+ circuit = /obj/item/circuitboard/ship/targeting
var/obj/machinery/ship_weapon/cannon
var/selected_entrypoint
var/platform_direction
diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm
index 9499303528b..4bda5fddf3a 100644
--- a/code/modules/overmap/ships/computers/helm.dm
+++ b/code/modules/overmap/ships/computers/helm.dm
@@ -281,6 +281,7 @@
icon_screen = "nav"
icon_keyboard = "cyan_key"
light_color = LIGHT_COLOR_CYAN
+ circuit = /obj/item/circuitboard/ship/navigation
/obj/machinery/computer/ship/navigation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!connected)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 90349033568..847b2015ac0 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -2152,7 +2152,7 @@
name = "Vacuum Fizz"
description = "Tastes like a hull breach in your mouth."
color = "#aee5e4"
- taste_description = "a hull breach"
+ taste_description = "hull breach"
carbonated = TRUE
glass_icon_state = "space-up_glass"
diff --git a/html/changelogs/mattatlas-youranswer.yml b/html/changelogs/mattatlas-youranswer.yml
new file mode 100644
index 00000000000..7ea2c7f4bb9
--- /dev/null
+++ b/html/changelogs/mattatlas-youranswer.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Holopads now properly convey accents."
+ - bugfix: "Fixed wheelchairs causing double teleportation on stairs."
+ - bugfix: "Fixed the old military jackets not having an open sprite. They will also work on coat racks now."
+ - bugfix: "Autolathes now properly update icons when printing things."
+ - bugfix: "Silencing humans (through the silent sting, covering mouth, etc) now works again. How long was that broken for...?"
+ - bugfix: "Added some helpful text on how to actually use changeling stings."
+ - bugfix: "Atmospheric control computers can no longer use bluespace to interact with air alarms outside of the Horizon."
+ - bugfix: "Navigation and targeting systems consoles can now actually be repaired."
+ - bugfix: "Fixed changeling fake death not actually faking death."
+ - bugfix: "Fixed the tie hair verb not respecting consciousness."
+ - bugfix: "Fixed adrenaline jittering not stopping once dead or faking death."
+ - bugfix: "Fixed vacuum fizz taste description."
+ - bugfix: "Adrenaline sacs now actually create reagents, meaning that lings can now actually benefit from synaptizine/hyperzine/oxycomorphine, thus massively helping lings against stuns. Use it!"
+ - bugfix: "Fixed IPC blood being red in some cases."
+ - bugfix: "Fixed oil-stained clothes sometimes showing up as blood-stained."
+ - bugfix: "Fixed simple mobs being permanently sleepy and falling asleep when they actually want to wake up. The horror."
+ - bugfix: "Fixed the secure ammunition storage turrets not being linked to the turret control."
+ - bugfix: "Fixed robotic organ repair with nanopaste not working."
\ No newline at end of file
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 1963ec45e92..4b32d901084 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 256bd59f58a..9de590a667d 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm
index a789f7ca964..88386d205d8 100644
--- a/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/abandoned_village.dmm
@@ -119,8 +119,8 @@
/area/exoplanet/adhomai)
"kJ" = (
/obj/structure/closet/crate/freezer,
-/obj/item/reagent_containers/cooking_container/plate,
-/obj/item/reagent_containers/cooking_container/plate,
+/obj/item/reagent_containers/bowl/plate,
+/obj/item/reagent_containers/bowl/plate,
/turf/simulated/floor/wood{
temperature = 268.15
},
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
index 56f1ff63519..b4ff1137599 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
@@ -620,7 +620,7 @@
/area/adhomai_bar)
"BZ" = (
/obj/structure/table/wood,
-/obj/item/reagent_containers/cooking_container/plate,
+/obj/item/reagent_containers/bowl/plate,
/turf/simulated/floor/wood{
temperature = 268.15
},
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm
index dfeb94247ee..adc61b300ce 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_raskariim_hideout.dmm
@@ -80,9 +80,9 @@
},
/area/exoplanet/adhomai)
"dg" = (
-/obj/item/stack/material/woodlog,
-/obj/item/stack/material/woodlog,
-/obj/item/stack/material/woodlog,
+/obj/item/stack/material/wood/log,
+/obj/item/stack/material/wood/log,
+/obj/item/stack/material/wood/log,
/turf/simulated/floor/exoplanet/snow{
temperature = 268.15
},
diff --git a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
index 9e30350c313..03e259f820c 100644
--- a/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/ala_base.dmm
@@ -657,9 +657,9 @@
},
/area/ala_base)
"wU" = (
-/obj/item/stack/material/woodlog/full,
-/obj/item/stack/material/woodlog/full,
-/obj/item/stack/material/woodlog/full,
+/obj/item/stack/material/wood/log/full,
+/obj/item/stack/material/wood/log/full,
+/obj/item/stack/material/wood/log/full,
/obj/structure/closet/crate/bin{
name = "fire wood bin"
},
@@ -1425,7 +1425,7 @@
},
/area/ala_base)
"Xe" = (
-/obj/item/stack/material/woodlog/full,
+/obj/item/stack/material/wood/log/full,
/obj/item/crowbar/rescue_axe/red{
name = "woodcutting axe";
desc = "A short lightweight tool meant to chop, pry and pierce wood."
diff --git a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
index 9bd22fbba2e..d932d9c11e2 100644
--- a/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/nka_base.dmm
@@ -101,9 +101,9 @@
},
/area/nka_base)
"hK" = (
-/obj/item/stack/material/woodlog/full,
-/obj/item/stack/material/woodlog/full,
-/obj/item/stack/material/woodlog/full,
+/obj/item/stack/material/wood/log/full,
+/obj/item/stack/material/wood/log/full,
+/obj/item/stack/material/wood/log/full,
/obj/structure/closet/crate/bin{
name = "fire wood bin"
},
diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
index 617590a0055..869b24e9760 100644
--- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
+++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
@@ -101,8 +101,8 @@
/obj/machinery/button/flasher{
id = "permflash";
name = "brig flashes";
- req_access = list(2);
- pixel_y = 23
+ pixel_y = 23;
+ req_access = list(2)
},
/obj/item/paper_bin,
/obj/item/pen,
@@ -1193,8 +1193,8 @@
dir = 8
},
/obj/machinery/door/window/eastleft{
- name = "Pun Pun Chamber";
dir = 2;
+ name = "Pun Pun Chamber";
req_access = list(25)
},
/obj/item/bananapeel,
@@ -1672,8 +1672,8 @@
/obj/item/clothing/head/helmet/riot,
/obj/item/clothing/head/helmet/riot,
/obj/machinery/door/window/brigdoor/southright{
- req_access = list(3);
- name = "Riot Armour"
+ name = "Riot Armour";
+ req_access = list(3)
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/armoury)
@@ -3258,8 +3258,8 @@
"byq" = (
/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/obj/machinery/door/blast/shutters/open{
- id = "shutters_deck2_hydroponicswindows";
dir = 8;
+ id = "shutters_deck2_hydroponicswindows";
name = "Window Shutter"
},
/turf/simulated/floor/tiled/dark/full,
@@ -3736,8 +3736,8 @@
name = "Door Bolt Control";
pixel_x = -38;
pixel_y = 32;
- specialfunctions = 4;
- req_one_access = list(20,41)
+ req_one_access = list(20,41);
+ specialfunctions = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4906,8 +4906,8 @@
pixel_y = 8
},
/obj/item/device/radio/intercom{
- pixel_x = 24;
- dir = 8
+ dir = 8;
+ pixel_x = 24
},
/turf/simulated/floor/tiled,
/area/horizon/security/equipment)
@@ -7197,8 +7197,8 @@
"dyU" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
- req_one_access = list(26,29,31,48,67);
- name = "Operations Maintenance"
+ name = "Operations Maintenance";
+ req_one_access = list(26,29,31,48,67)
},
/turf/simulated/floor/tiled/full,
/area/operations/break_room)
@@ -7752,6 +7752,8 @@
dir = 4
},
/obj/machinery/turretid{
+ control_area = "Horizon - Secure Ammunitions Storage";
+ dir = 4;
name = "\improper Secure Ammunition Storage Turret Control Console";
pixel_x = -26;
dir = 4;
@@ -8417,8 +8419,8 @@
/obj/structure/sign/securearea{
desc = "A caution sign which reads 'CAUTION: BRIG COMMUNAL AREA' and 'SECURE AREA'.";
name = "\improper BRIG COMMUNAL AREA sign";
- pixel_y = 32;
- pixel_x = -32
+ pixel_x = -32;
+ pixel_y = 32
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/effect/floor_decal/industrial/warning{
@@ -8853,16 +8855,16 @@
},
/obj/machinery/door/blast/regular{
density = 0;
+ dir = 4;
icon_state = "pdoor0";
id = "cell_isolation";
name = "Isolation Cell Blast Door";
- opacity = 0;
- dir = 4
+ opacity = 0
},
/obj/machinery/door/blast/shutters{
dir = 2;
- name = "Viewing Shutter";
- id = "cell_isolation_viewing"
+ id = "cell_isolation_viewing";
+ name = "Viewing Shutter"
},
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship,
@@ -8952,9 +8954,9 @@
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 2;
id = "bar_viewing_shutters";
- dir = 2
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
@@ -9419,11 +9421,11 @@
/obj/structure/cable/green,
/obj/machinery/door/blast/regular{
density = 0;
+ dir = 4;
icon_state = "pdoor0";
id = "Brig Lockdown";
name = "Brig Lockdown Blast Door";
- opacity = 0;
- dir = 4
+ opacity = 0
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/brig)
@@ -10791,12 +10793,12 @@
icon_state = "4-8"
},
/obj/machinery/button/flasher{
+ dir = 8;
id = "permflash";
name = "brig flashes";
- req_access = list(2);
- pixel_y = 24;
pixel_x = 23;
- dir = 8
+ pixel_y = 24;
+ req_access = list(2)
},
/obj/effect/floor_decal/corner/paleblue/full{
dir = 1
@@ -11242,10 +11244,10 @@
dir = 4
},
/obj/machinery/button/remote/blast_door{
- name = "Viewing Shutters";
+ dir = 1;
id = "lounge_window_shutters";
- pixel_y = -37;
- dir = 1
+ name = "Viewing Shutters";
+ pixel_y = -37
},
/obj/machinery/light,
/turf/simulated/floor/wood,
@@ -11866,9 +11868,9 @@
},
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 2;
id = "bar_viewing_shutters";
- dir = 2
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/reinforced,
@@ -12016,9 +12018,9 @@
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/plating,
@@ -13261,9 +13263,9 @@
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters/open{
- name = "lounge window shutter";
+ dir = 2;
id = "lounge_window_shutters";
- dir = 2
+ name = "lounge window shutter"
},
/turf/simulated/floor/reinforced,
/area/horizon/crew_quarters/lounge/bar)
@@ -13629,9 +13631,9 @@
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/turf/simulated/floor/plating,
/area/horizon/bar)
@@ -15379,16 +15381,16 @@
id = "armory";
name = "Armoury Blast Doors";
pixel_x = -25;
- req_access = list(3);
- pixel_y = 7
+ pixel_y = 7;
+ req_access = list(3)
},
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
/obj/machinery/camera/network/security{
c_tag = "Security - Armoury Starboard";
- network = list("Security","Armory");
- dir = 4
+ dir = 4;
+ network = list("Security","Armory")
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/armoury)
@@ -15453,9 +15455,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/sortjunction/flipped{
+ dir = 2;
name = "Security";
- sortType = "Security";
- dir = 2
+ sortType = "Security"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/turf/simulated/floor/tiled,
@@ -16668,9 +16670,9 @@
},
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/reinforced,
@@ -16926,8 +16928,8 @@
pixel_y = -7
},
/obj/item/device/hand_labeler{
- pixel_y = 10;
- pixel_x = 7
+ pixel_x = 7;
+ pixel_y = 10
},
/obj/machinery/firealarm/east,
/obj/effect/floor_decal/corner/paleblue{
@@ -18050,11 +18052,11 @@
dir = 8
},
/obj/machinery/button/remote/blast_door{
+ dir = 8;
id = "bar_viewing_shutters";
name = "Viewing Shutters";
pixel_x = 25;
- pixel_y = -7;
- dir = 8
+ pixel_y = -7
},
/obj/effect/floor_decal/spline/plain/cee{
dir = 4
@@ -18406,8 +18408,8 @@
/obj/item/clothing/head/helmet/ablative,
/obj/item/clothing/head/helmet/ablative,
/obj/machinery/door/window/brigdoor/southright{
- req_access = list(3);
- name = "Ablative Armour"
+ name = "Ablative Armour";
+ req_access = list(3)
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/armoury)
@@ -18538,8 +18540,8 @@
pixel_x = 32
},
/obj/machinery/newscaster{
- pixel_y = -32;
- pixel_x = 32
+ pixel_x = 32;
+ pixel_y = -32
},
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/chief)
@@ -20074,11 +20076,11 @@
},
/obj/structure/disposalpipe/segment,
/obj/machinery/button/remote/blast_door{
+ dir = 4;
id = "bar_shutter";
name = "Desk Shutters";
pixel_x = -25;
- req_access = list(25);
- dir = 4
+ req_access = list(25)
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
@@ -20194,9 +20196,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/obj/structure/grille,
/obj/effect/landmark/entry_point/starboard{
@@ -20682,8 +20684,8 @@
dir = 4
},
/obj/machinery/vending/dinnerware/plastic{
- pixel_y = 24;
- density = 0
+ density = 0;
+ pixel_y = 24
},
/turf/simulated/floor/lino/grey,
/area/horizon/crew_quarters/lounge/bar)
@@ -20709,16 +20711,16 @@
},
/obj/machinery/door/blast/regular{
density = 0;
+ dir = 4;
icon_state = "pdoor0";
id = "cell_isolation";
name = "Isolation Cell Blast Door";
- opacity = 0;
- dir = 4
+ opacity = 0
},
/obj/machinery/door/blast/shutters{
dir = 2;
- name = "Viewing Shutter";
- id = "cell_isolation_viewing"
+ id = "cell_isolation_viewing";
+ name = "Viewing Shutter"
},
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship,
@@ -21133,8 +21135,8 @@
c_tag = "Security - Holding Cell B"
},
/obj/item/paper/pamphlet{
- pixel_y = 8;
- pixel_x = -8
+ pixel_x = -8;
+ pixel_y = 8
},
/obj/machinery/status_display{
pixel_y = 32
@@ -21149,9 +21151,9 @@
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 2;
id = "bar_viewing_shutters";
- dir = 2
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/obj/effect/landmark/entry_point/fore{
@@ -21620,9 +21622,9 @@
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters/open{
- name = "lounge window shutter";
+ dir = 2;
id = "lounge_window_shutters";
- dir = 2
+ name = "lounge window shutter"
},
/turf/simulated/floor/reinforced,
/area/horizon/crew_quarters/lounge/bar)
@@ -22005,8 +22007,8 @@
/area/horizon/exterior)
"kHj" = (
/obj/machinery/door/airlock/maintenance{
- req_one_access = list(12,25);
- name = "Bar Maintenance"
+ name = "Bar Maintenance";
+ req_one_access = list(12,25)
},
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -22049,9 +22051,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/obj/machinery/door/blast/shutters/open{
- name = "Viewing Shutter";
+ dir = 2;
id = "kitchen_window_shutters";
- dir = 2
+ name = "Viewing Shutter"
},
/turf/simulated/floor/plating,
/area/horizon/kitchen/freezer)
@@ -22599,8 +22601,8 @@
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
- req_one_access = list(26,29,31,48,67);
- name = "Operations Maintenance"
+ name = "Operations Maintenance";
+ req_one_access = list(26,29,31,48,67)
},
/turf/simulated/floor/tiled/full,
/area/operations/office)
@@ -24977,9 +24979,9 @@
icon_state = "pipe-c"
},
/obj/machinery/light_switch{
+ dir = 4;
pixel_x = -24;
- pixel_y = 23;
- dir = 4
+ pixel_y = 23
},
/turf/simulated/floor/tiled/white,
/area/horizon/kitchen)
@@ -28089,8 +28091,8 @@
},
/obj/machinery/camera/network/security{
c_tag = "Security - Armoury Port";
- network = list("Security","Armory");
- dir = 8
+ dir = 8;
+ network = list("Security","Armory")
},
/obj/machinery/recharger/wallcharger{
pixel_x = 36;
@@ -31904,8 +31906,8 @@
dir = 10
},
/obj/machinery/alarm{
- pixel_y = -28;
- dir = 1
+ dir = 1;
+ pixel_y = -28
},
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
@@ -32169,9 +32171,9 @@
/obj/structure/grille,
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/obj/effect/landmark/entry_point/starboard{
name = "starboard, bar lounge"
@@ -33187,11 +33189,11 @@
},
/obj/machinery/turretid/lethal{
dir = 4;
- pixel_x = 6;
name = "Vault Turret Control";
+ pixel_x = 6;
pixel_y = 32;
- req_one_access = list(20,41);
- req_access = null
+ req_access = null;
+ req_one_access = list(20,41)
},
/turf/simulated/floor/tiled/full,
/area/storage/secure)
@@ -34319,9 +34321,9 @@
/obj/machinery/button/remote/airlock{
id = "cargobreak_shower";
name = "Door Bolt Control";
+ pixel_x = 7;
pixel_y = 25;
- specialfunctions = 4;
- pixel_x = 7
+ specialfunctions = 4
},
/obj/machinery/light/small{
dir = 1
@@ -36360,8 +36362,8 @@
/obj/item/clothing/head/helmet/ballistic,
/obj/item/clothing/head/helmet/ballistic,
/obj/machinery/door/window/brigdoor/southright{
- req_access = list(3);
- name = "Ballistic Armour"
+ name = "Ballistic Armour";
+ req_access = list(3)
},
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/armoury)
@@ -37128,8 +37130,8 @@
/area/maintenance/wing/starboard/far)
"sem" = (
/obj/machinery/door/airlock/maintenance{
- req_one_access = list(26,29,31,48,67);
- name = "Operations Maintenance"
+ name = "Operations Maintenance";
+ req_one_access = list(26,29,31,48,67)
},
/obj/machinery/door/firedoor,
/obj/structure/disposalpipe/segment{
@@ -37563,9 +37565,9 @@
},
/obj/effect/floor_decal/industrial/warning/corner,
/obj/structure/sign/securearea{
- pixel_x = 32;
desc = "A warning sign which reads 'WARNING' and 'ARMOURY'.";
- name = "\improper WARNING: ARMOURY sign"
+ name = "\improper WARNING: ARMOURY sign";
+ pixel_x = 32
},
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
@@ -38947,28 +38949,28 @@
pixel_y = 7
},
/obj/machinery/button/remote/blast_door{
- name = "Window Shutters";
- id = "kitchen_window_shutters";
- pixel_x = -25;
- req_access = list(28);
dir = 4;
- pixel_y = -4
+ id = "kitchen_window_shutters";
+ name = "Window Shutters";
+ pixel_x = -25;
+ pixel_y = -4;
+ req_access = list(28)
},
/obj/machinery/button/remote/blast_door{
- name = "Desk Shutters";
+ dir = 4;
id = "shutters_deck2_kitchendesk";
+ name = "Desk Shutters";
pixel_x = -35;
pixel_y = -4;
- req_access = list(28);
- dir = 4
+ req_access = list(28)
},
/obj/machinery/button/remote/blast_door{
- name = "SmartHeater Shutter";
+ dir = 4;
id = "shutters_deck2_smartheater";
+ name = "SmartHeater Shutter";
pixel_x = -35;
pixel_y = 7;
- req_access = list(28);
- dir = 4
+ req_access = list(28)
},
/turf/simulated/floor/tiled/white,
/area/horizon/kitchen)
@@ -39067,8 +39069,8 @@
c_tag = "Security - Holding Cell A"
},
/obj/item/paper/pamphlet{
- pixel_y = 8;
- pixel_x = 8
+ pixel_x = 8;
+ pixel_y = 8
},
/obj/machinery/status_display{
pixel_y = 32
@@ -39252,9 +39254,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/obj/machinery/door/blast/shutters/open{
- name = "Viewing Shutter";
+ dir = 2;
id = "kitchen_window_shutters";
- dir = 2
+ name = "Viewing Shutter"
},
/turf/simulated/floor/plating,
/area/horizon/kitchen)
@@ -39645,8 +39647,8 @@
},
/obj/machinery/light,
/obj/machinery/alarm{
- pixel_y = -28;
- dir = 1
+ dir = 1;
+ pixel_y = -28
},
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
@@ -40544,9 +40546,9 @@
"tRz" = (
/obj/structure/lattice/catwalk,
/obj/machinery/door/window/northleft{
+ dir = 8;
name = "Hydroponics";
- req_access = list(35);
- dir = 8
+ req_access = list(35)
},
/turf/simulated/open,
/area/horizon/hydroponics)
@@ -42532,9 +42534,9 @@
/obj/structure/grille/diagonal,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 2;
id = "bar_viewing_shutters";
- dir = 2
+ name = "Bar Viewing Shutters"
},
/obj/machinery/door/firedoor,
/turf/simulated/floor/reinforced,
@@ -43284,9 +43286,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "lounge window shutter";
+ dir = 2;
id = "lounge_window_shutters";
- dir = 2
+ name = "lounge window shutter"
},
/obj/effect/landmark/entry_point/fore{
name = "fore, dining hall"
@@ -43639,9 +43641,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "lounge window shutter";
+ dir = 2;
id = "lounge_window_shutters";
- dir = 2
+ name = "lounge window shutter"
},
/turf/simulated/floor/plating,
/area/horizon/crew_quarters/lounge/bar)
@@ -44288,9 +44290,9 @@
/obj/machinery/button/remote/airlock{
id = "cargobreak_stall";
name = "Door Bolt Control";
+ pixel_x = 7;
pixel_y = 25;
- specialfunctions = 4;
- pixel_x = 7
+ specialfunctions = 4
},
/obj/machinery/light/small{
dir = 1
@@ -46203,9 +46205,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/obj/machinery/door/blast/shutters/open{
- name = "Viewing Shutter";
+ dir = 4;
id = "kitchen_window_shutters";
- dir = 4
+ name = "Viewing Shutter"
},
/turf/simulated/floor/plating,
/area/horizon/kitchen/freezer)
@@ -46587,8 +46589,8 @@
pixel_x = 8
},
/obj/item/grenade/chem_grenade/large/phoroncleaner{
- pixel_y = 7;
- pixel_x = 1
+ pixel_x = 1;
+ pixel_y = 7
},
/obj/structure/window/reinforced{
dir = 4
@@ -46863,8 +46865,8 @@
/area/horizon/security/office)
"wLZ" = (
/obj/machinery/door/airlock/multi_tile/glass{
- req_access = list(1);
- name = "Equipment Room"
+ name = "Equipment Room";
+ req_access = list(1)
},
/obj/machinery/door/firedoor/multi_tile,
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -46880,9 +46882,9 @@
/obj/machinery/door/firedoor,
/obj/structure/window/shuttle/scc_space_ship,
/obj/machinery/door/blast/shutters/open{
- name = "Bar Viewing Shutters";
+ dir = 8;
id = "bar_viewing_shutters";
- dir = 8
+ name = "Bar Viewing Shutters"
},
/turf/simulated/floor/plating,
/area/horizon/bar)
@@ -47319,34 +47321,34 @@
dir = 4
},
/obj/machinery/button/remote/blast_door{
+ dir = 8;
id = "Security Lockdown";
name = "Security Lockdown";
pixel_x = 38;
pixel_y = 38;
- req_access = list(58);
- dir = 8
+ req_access = list(58)
},
/obj/machinery/button/remote/airlock{
+ dir = 8;
id = "HoSdoor";
name = "Office Door";
pixel_x = 27;
- pixel_y = 38;
- dir = 8
+ pixel_y = 38
},
/obj/machinery/button/switch/windowtint{
+ dir = 4;
id = "HoS Windows";
pixel_x = 26;
pixel_y = 28;
- req_access = list(58);
- dir = 4
+ req_access = list(58)
},
/obj/machinery/button/remote/blast_door{
+ dir = 8;
id = "armory";
name = "Armory Shutters";
pixel_x = 38;
pixel_y = 28;
- req_access = list(58);
- dir = 8
+ req_access = list(58)
},
/turf/simulated/floor/carpet,
/area/horizon/security/head_of_security)
@@ -47898,8 +47900,8 @@
/obj/machinery/ringer{
department = "Engineering";
id = "engie_ringer";
- req_access = list(11);
- pixel_y = 32
+ pixel_y = 32;
+ req_access = list(11)
},
/turf/simulated/floor/tiled,
/area/engineering/lobby)
@@ -48203,8 +48205,8 @@
/area/horizon/crew_quarters/lounge/bar)
"xtW" = (
/obj/effect/floor_decal/plaque{
- name = "\improper SCCV Horizon plaque";
- desc = "A plaque commemorating the SCCV Horizon's launch by the unbreakable chainlink, the SCC. The one thing holding the Orion Spur together. According to some, anyways."
+ desc = "A plaque commemorating the SCCV Horizon's launch by the unbreakable chainlink, the SCC. The one thing holding the Orion Spur together. According to some, anyways.";
+ name = "\improper SCCV Horizon plaque"
},
/obj/effect/floor_decal/spline/fancy/wood/full,
/turf/simulated/floor/wood,
@@ -48319,8 +48321,8 @@
dir = 1
},
/obj/machinery/door/window/brigdoor/southright{
- req_access = list(3);
- name = "Heavy Armour"
+ name = "Heavy Armour";
+ req_access = list(3)
},
/obj/item/clothing/suit/armor/carrier/heavy/sec,
/obj/item/clothing/suit/armor/carrier/heavy/sec,
@@ -48484,8 +48486,8 @@
"xCr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/window/eastleft{
- name = "Bar Access";
dir = 8;
+ name = "Bar Access";
req_access = list(25)
},
/obj/machinery/door/blast/shutters{