"}
-/obj/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu
+/obj/vehicle/sealed/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu
. = {"
"}
- if(equipment.len)
- for(var/X in equipment)
- var/obj/item/mecha_parts/mecha_equipment/W = X
- . += "[W.name] [W.detachable?"
Detach":"\[Non-removable\]
"]"
- . += {"
Available equipment slots: [max_equip-equipment.len]
+ for(var/e in equipment)
+ var/obj/item/mecha_parts/mecha_equipment/equipment = e
+ . += "[equipment.name] [equipment.detachable ? "
Detach" : "\[Non-removable\]
"]"
+ . += {"
Available equipment slots: [max_equip-LAZYLEN(equipment)]
"}
-/obj/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user)
+/obj/vehicle/sealed/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user)
if(!id_card || !user)
return
. = {"
@@ -191,7 +190,7 @@
onclose(user, "exosuit_add_access")
-/obj/mecha/proc/output_maintenance_dialog(obj/item/card/id/id_card,mob/user)
+/obj/vehicle/sealed/mecha/proc/output_maintenance_dialog(obj/item/card/id/id_card,mob/user)
if(!id_card || !user)
return
. = {"
@@ -203,8 +202,8 @@
- [add_req_access?"
Edit operation keycodes":null]
- [maint_access?"
[(construction_state > MECHA_LOCKED) ? "Terminate" : "Initiate"] maintenance protocol":null]
+ [(mecha_flags & ADDING_ACCESS_POSSIBLE)?"
Edit operation keycodes":null]
+ [(mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE)?"
[(construction_state > MECHA_LOCKED) ? "Terminate" : "Initiate"] maintenance protocol":null]
[(construction_state == MECHA_OPEN_HATCH) ?"--------------------":null]
[(construction_state == MECHA_OPEN_HATCH) ?"[cell?"
Drop power cell":"No cell installed"]":null]
[(construction_state == MECHA_OPEN_HATCH) ?"[scanmod?"
Drop scanning module":"No scanning module installed"]":null]
@@ -223,7 +222,7 @@
///// Topic /////
/////////////////
-/obj/mecha/Topic(href, href_list)
+/obj/vehicle/sealed/mecha/Topic(href, href_list)
..()
if(!usr)
@@ -244,13 +243,13 @@
return
if(href_list["req_access"])
- if(!add_req_access)
+ if(!(mecha_flags & ADDING_ACCESS_POSSIBLE))
return
output_access_dialog(id_card,usr)
return
if(href_list["maint_access"])
- if(!maint_access)
+ if(!(mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE))
return
if(construction_state == MECHA_LOCKED)
construction_state = MECHA_SECURE_BOLTS
@@ -280,14 +279,14 @@
return
if(href_list["add_req_access"])
- if(!add_req_access)
+ if(!(mecha_flags & ADDING_ACCESS_POSSIBLE))
return
operation_req_access += text2num(href_list["add_req_access"])
output_access_dialog(id_card,usr)
return
if(href_list["del_req_access"])
- if(!add_req_access)
+ if(!(mecha_flags & ADDING_ACCESS_POSSIBLE))
return
operation_req_access -= text2num(href_list["del_req_access"])
output_access_dialog(id_card, usr)
@@ -296,7 +295,7 @@
//Here ID access stuff goes to die.
if(href_list["finish_req_access"])
- add_req_access = 0
+ mecha_flags &= ~ADDING_ACCESS_POSSIBLE
usr << browse(null,"window=exosuit_add_access")
return
@@ -310,7 +309,7 @@
return
//Start of all internal topic stuff.
- if(usr != occupant)
+ if(!locate(usr) in occupants)
return
if(href_list["update_content"])
@@ -323,7 +322,7 @@
if(!equip || !equip.selectable)
return
selected = equip
- occupant_message("
You switch to [equip].")
+ to_chat(occupants, "[icon2html(src, occupants)]
You switch to [equip].")
visible_message("
[src] raises [equip].")
send_byjax(usr, "exosuit.browser", "eq_list", get_equipment_list())
return
@@ -350,53 +349,54 @@
//Changes the exosuit name.
if(href_list["change_name"])
var/userinput = stripped_input(usr, "Choose a new exosuit name.", "Rename exosuit", "", MAX_NAME_LEN)
- if(!userinput || usr != occupant || usr.incapacitated())
+ if(!userinput || !locate(usr) in occupants || usr.incapacitated())
return
name = userinput
return
//Toggles ID upload.
if (href_list["toggle_id_upload"])
- add_req_access = !add_req_access
- send_byjax(usr,"exosuit.browser","t_id_upload","[add_req_access?"L":"Unl"]ock ID upload panel")
+ mecha_flags ^= ADDING_ACCESS_POSSIBLE
+ send_byjax(usr,"exosuit.browser","t_id_upload","[(mecha_flags & ADDING_ACCESS_POSSIBLE)?"L":"Unl"]ock ID upload panel")
return
//Toggles main access.
if(href_list["toggle_maint_access"])
if(construction_state)
- occupant_message("
Maintenance protocols in effect")
+ to_chat(occupants, "[icon2html(src, occupants)]
Maintenance protocols in effect")
return
- maint_access = !maint_access
- send_byjax(usr,"exosuit.browser","t_maint_access","[maint_access?"Forbid":"Permit"] maintenance protocols")
+ mecha_flags ^= ADDING_MAINT_ACCESS_POSSIBLE
+ send_byjax(usr,"exosuit.browser","t_maint_access","[(mecha_flags & ADDING_MAINT_ACCESS_POSSIBLE)?"Forbid":"Permit"] maintenance protocols")
return
//Toggles connection port.
if (href_list["toggle_port_connection"])
if(internal_tank.connected_port)
if(internal_tank.disconnect())
- occupant_message("
Disconnected from the air system port.")
+ to_chat(occupants, "[icon2html(src, occupants)]
Disconnected from the air system port.")
log_message("Disconnected from gas port.", LOG_MECHA)
else
- occupant_message("
Unable to disconnect from the air system port!")
+ to_chat(occupants, "[icon2html(src, occupants)]
Unable to disconnect from the air system port!")
return
else
var/obj/machinery/atmospherics/components/unary/portables_connector/possible_port = locate() in loc
if(internal_tank.connect(possible_port))
- occupant_message("
Connected to the air system port.")
+ to_chat(occupants, "[icon2html(src, occupants)]
Connected to the air system port.")
log_message("Connected to gas port.", LOG_MECHA)
else
- occupant_message("
Unable to connect with air system port!")
+ to_chat(occupants, "[icon2html(src, occupants)]
Unable to connect with air system port!")
return
- send_byjax(occupant,"exosuit.browser","t_port_connection","[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port")
+ send_byjax(occupants,"exosuit.browser","t_port_connection","[internal_tank.connected_port?"Disconnect from":"Connect to"] gas port")
return
//Turns on the DNA lock
if(href_list["dna_lock"])
- if(!iscarbon(occupant) || !occupant.dna)
- occupant_message("
You feel a prick as the needle takes your DNA sample.")
+ var/mob/living/carbon/user = usr
+ if(!istype(user) || !user.dna)
+ to_chat(user, "[icon2html(src, occupants)]
You can't create a DNA lock with no DNA!.")
return
- dna_lock = occupant.dna.unique_enzymes
- occupant_message("
You feel a prick as the needle takes your DNA sample.")
+ dna_lock = user.dna.unique_enzymes
+ to_chat(user, "[icon2html(src, occupants)]
You feel a prick as the needle takes your DNA sample.")
return
//Resets the DNA lock
@@ -406,16 +406,16 @@
//Repairs internal damage
if(href_list["repair_int_control_lost"])
- occupant_message("
Recalibrating coordination system...")
+ to_chat(occupants, "[icon2html(src, occupants)]
Recalibrating coordination system...")
log_message("Recalibration of coordination system started.", LOG_MECHA)
addtimer(CALLBACK(src, .proc/stationary_repair, loc), 100, TIMER_UNIQUE)
///Repairs internal damage if the mech hasn't moved.
-/obj/mecha/proc/stationary_repair(location)
+/obj/vehicle/sealed/mecha/proc/stationary_repair(location)
if(location == loc)
clearInternalDamage(MECHA_INT_CONTROL_LOST)
- occupant_message("
Recalibration successful.")
+ to_chat(occupants, "[icon2html(src, occupants)]
Recalibration successful.")
log_message("Recalibration of coordination system finished with 0 errors.", LOG_MECHA)
else
- occupant_message("
Recalibration failed!")
+ to_chat(occupants, "[icon2html(src, occupants)]
Recalibration failed!")
log_message("Recalibration of coordination system failed with 1 error.", LOG_MECHA, color="red")
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm
similarity index 100%
rename from code/game/mecha/mecha_wreckage.dm
rename to code/modules/vehicles/mecha/mecha_wreckage.dm
diff --git a/code/game/mecha/medical/odysseus.dm b/code/modules/vehicles/mecha/medical/odysseus.dm
similarity index 59%
rename from code/game/mecha/medical/odysseus.dm
rename to code/modules/vehicles/mecha/medical/odysseus.dm
index 27e139c84ab..1991d683af1 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/modules/vehicles/mecha/medical/odysseus.dm
@@ -1,29 +1,31 @@
-/obj/mecha/medical/odysseus
+/obj/vehicle/sealed/mecha/medical/odysseus
desc = "These exosuits are developed and produced by Vey-Med. (© All rights reserved)."
name = "\improper Odysseus"
icon_state = "odysseus"
- step_in = 2
+ allow_diagonal_movement = TRUE
+ movedelay = 2
max_temperature = 15000
max_integrity = 120
wreckage = /obj/structure/mecha_wreckage/odysseus
internal_damage_threshold = 35
deflect_chance = 15
step_energy_drain = 6
+ internals_req_access = list(ACCESS_MECH_SCIENCE, ACCESS_MECH_MEDICAL)
-/obj/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H)
+/obj/vehicle/sealed/mecha/medical/odysseus/moved_inside(mob/living/carbon/human/H)
. = ..()
if(.)
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
hud.add_hud_to(H)
-/obj/mecha/medical/odysseus/go_out()
- if(isliving(occupant))
- var/mob/living/L = occupant
+/obj/vehicle/sealed/mecha/medical/odysseus/remove_occupant(mob/M)
+ if(isliving(M))
+ var/mob/living/L = M
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
hud.remove_hud_from(L)
- ..()
+ return ..()
-/obj/mecha/medical/odysseus/mmi_moved_inside(obj/item/mmi/M, mob/user)
+/obj/vehicle/sealed/mecha/medical/odysseus/mmi_moved_inside(obj/item/mmi/M, mob/user)
. = ..()
if(.)
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
diff --git a/code/game/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm
similarity index 79%
rename from code/game/mecha/working/clarke.dm
rename to code/modules/vehicles/mecha/working/clarke.dm
index 07ae1e62d3e..25e782ca96c 100644
--- a/code/game/mecha/working/clarke.dm
+++ b/code/modules/vehicles/mecha/working/clarke.dm
@@ -1,11 +1,11 @@
///Lavaproof, fireproof, fast mech with low armor and higher energy consumption, cannot strafe and has an internal ore box.
-/obj/mecha/working/clarke
+/obj/vehicle/sealed/mecha/working/clarke
desc = "Combining man and machine for a better, stronger engineer. Can even resist lava!"
name = "\improper Clarke"
icon_state = "clarke"
max_temperature = 65000
max_integrity = 200
- step_in = 1.25
+ movedelay = 1.25
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
lights_power = 7
deflect_chance = 10
@@ -14,34 +14,34 @@
max_equip = 7
wreckage = /obj/structure/mecha_wreckage/clarke
enter_delay = 40
- canstrafe = FALSE
+ mecha_flags = ADDING_ACCESS_POSSIBLE | IS_ENCLOSED
/// Handles an internal ore box for Clarke
var/obj/structure/ore_box/box
-/obj/mecha/working/clarke/Initialize()
+/obj/vehicle/sealed/mecha/working/clarke/Initialize()
. = ..()
box = new /obj/structure/ore_box(src)
var/obj/item/mecha_parts/mecha_equipment/orebox_manager/ME = new(src)
ME.attach(src)
-/obj/mecha/working/clarke/Destroy()
+/obj/vehicle/sealed/mecha/working/clarke/Destroy()
box.dump_box_contents()
return ..()
-/obj/mecha/working/clarke/moved_inside(mob/living/carbon/human/H)
+/obj/vehicle/sealed/mecha/working/clarke/moved_inside(mob/living/carbon/human/H)
. = ..()
if(.)
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED]
hud.add_hud_to(H)
-/obj/mecha/working/clarke/go_out()
- if(isliving(occupant))
- var/mob/living/L = occupant
+/obj/vehicle/sealed/mecha/working/clarke/remove_occupant(mob/M)
+ if(isliving(M))
+ var/mob/living/L = M
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED]
hud.remove_hud_from(L)
return ..()
-/obj/mecha/working/clarke/mmi_moved_inside(obj/item/mmi/M, mob/user)
+/obj/vehicle/sealed/mecha/working/clarke/mmi_moved_inside(obj/item/mmi/M, mob/user)
. = ..()
if(.)
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED]
@@ -60,11 +60,11 @@
detachable = FALSE
salvageable = FALSE
/// Var to avoid istype checking every time the topic button is pressed. This will only work inside Clarke mechs.
- var/obj/mecha/working/clarke/hostmech
+ var/obj/vehicle/sealed/mecha/working/clarke/hostmech
-/obj/item/mecha_parts/mecha_equipment/orebox_manager/attach(obj/mecha/M)
+/obj/item/mecha_parts/mecha_equipment/orebox_manager/attach(obj/vehicle/sealed/mecha/M)
. = ..()
- if(istype(M, /obj/mecha/working/clarke))
+ if(istype(M, /obj/vehicle/sealed/mecha/working/clarke))
hostmech = M
/obj/item/mecha_parts/mecha_equipment/orebox_manager/detach()
diff --git a/code/game/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm
similarity index 79%
rename from code/game/mecha/working/ripley.dm
rename to code/modules/vehicles/mecha/working/ripley.dm
index 3dc9531adae..3cc13ab6883 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/modules/vehicles/mecha/working/ripley.dm
@@ -1,9 +1,9 @@
-/obj/mecha/working/ripley
+/obj/vehicle/sealed/mecha/working/ripley
desc = "Autonomous Power Loader Unit MK-I. Designed primarily around heavy lifting, the Ripley can be outfitted with utility equipment to fill a number of roles."
name = "\improper APLU MK-I \"Ripley\""
icon_state = "ripley"
silicon_icon_state = "ripley-empty"
- step_in = 1.5 //Move speed, lower is faster.
+ movedelay = 1.5 //Move speed, lower is faster.
/// How fast the mech is in low pressure
var/fast_pressure_step_in = 1.5
/// How fast the mech is in normal pressure
@@ -26,42 +26,42 @@
/// How much things Ripley can carry in their Cargo Compartment
var/cargo_capacity = 15
-/obj/mecha/working/ripley/Move()
+/obj/vehicle/sealed/mecha/working/ripley/Move()
. = ..()
update_pressure()
-/obj/mecha/working/ripley/go_out()
+/obj/vehicle/sealed/mecha/working/ripley/mob_exit(mob/M, silent, forced)
..()
update_icon()
-/obj/mecha/working/ripley/moved_inside(mob/living/carbon/human/H)
+/obj/vehicle/sealed/mecha/working/ripley/moved_inside(mob/living/carbon/human/H)
..()
update_icon()
-/obj/mecha/working/ripley/check_for_internal_damage(list/possible_int_damage,ignore_threshold=null)
+/obj/vehicle/sealed/mecha/working/ripley/check_for_internal_damage(list/possible_int_damage, ignore_threshold = FALSE)
if (!enclosed)
possible_int_damage -= (MECHA_INT_TEMP_CONTROL + MECHA_INT_TANK_BREACH) //if we don't even have an air tank, these two doesn't make a ton of sense.
. = ..()
-/obj/mecha/working/ripley/Initialize()
+/obj/vehicle/sealed/mecha/working/ripley/Initialize()
. = ..()
AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list(MELEE = 10, BULLET = 5, LASER = 5))
-/obj/mecha/working/ripley/Destroy()
+/obj/vehicle/sealed/mecha/working/ripley/Destroy()
for(var/atom/movable/A in cargo)
A.forceMove(drop_location())
step_rand(A)
cargo.Cut()
return ..()
-/obj/mecha/working/ripley/mkii
+/obj/vehicle/sealed/mecha/working/ripley/mkii
desc = "Autonomous Power Loader Unit MK-II. This prototype Ripley is refitted with a pressurized cabin, trading its prior speed for atmospheric protection and armor."
name = "\improper APLU MK-II \"Ripley\""
icon_state = "ripleymkii"
fast_pressure_step_in = 2 //step_in while in low pressure conditions
slow_pressure_step_in = 4 //step_in while in normal pressure conditions
- step_in = 4
+ movedelay = 4
max_temperature = 30000
max_integrity = 250
armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 60, BIO = 0, RAD = 70, FIRE = 100, ACID = 100)
@@ -69,47 +69,45 @@
enclosed = TRUE
enter_delay = 40
silicon_icon_state = null
- opacity = TRUE
-/obj/mecha/working/ripley/deathripley
+/obj/vehicle/sealed/mecha/working/ripley/deathripley
desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE"
name = "\improper DEATH-RIPLEY"
icon_state = "deathripley"
fast_pressure_step_in = 2 //step_in while in low pressure conditions
slow_pressure_step_in = 3 //step_in while in normal pressure conditions
- step_in = 4
+ movedelay = 4
lights_power = 7
wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
step_energy_drain = 0
enclosed = TRUE
enter_delay = 40
silicon_icon_state = null
- opacity = TRUE
-/obj/mecha/working/ripley/deathripley/Initialize()
+/obj/vehicle/sealed/mecha/working/ripley/deathripley/Initialize()
. = ..()
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
ME.attach(src)
-/obj/mecha/working/ripley/deathripley/real
+/obj/vehicle/sealed/mecha/working/ripley/deathripley/real
desc = "OH SHIT IT'S THE DEATHSQUAD WE'RE ALL GONNA DIE. FOR REAL"
-/obj/mecha/working/ripley/deathripley/real/Initialize()
+/obj/vehicle/sealed/mecha/working/ripley/deathripley/real/Initialize()
. = ..()
for(var/obj/item/mecha_parts/mecha_equipment/E in equipment)
E.detach()
qdel(E)
- equipment.Cut()
+ LAZYCLEARLIST(equipment)
var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/real
ME.attach(src)
-/obj/mecha/working/ripley/mining
+/obj/vehicle/sealed/mecha/working/ripley/mining
desc = "An old, dusty mining Ripley."
name = "\improper APLU \"Miner\""
obj_integrity = 75 //Low starting health
-/obj/mecha/working/ripley/mining/Initialize()
+/obj/vehicle/sealed/mecha/working/ripley/mining/Initialize()
. = ..()
if(cell)
cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge
@@ -137,24 +135,24 @@
var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new
scanner.attach(src)
-/obj/mecha/working/ripley/Exit(atom/movable/O)
+/obj/vehicle/sealed/mecha/working/ripley/Exit(atom/movable/O)
if(O in cargo)
return 0
return ..()
-/obj/mecha/working/ripley/Topic(href, href_list)
+/obj/vehicle/sealed/mecha/working/ripley/Topic(href, href_list)
..()
if(href_list["drop_from_cargo"])
var/obj/O = locate(href_list["drop_from_cargo"]) in cargo
if(O)
- occupant_message("
You unload [O].")
+ to_chat(occupants, "[icon2html(src, occupants)]
You unload [O].")
O.forceMove(drop_location())
cargo -= O
log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]", LOG_MECHA)
return
-/obj/mecha/working/ripley/contents_explosion(severity, target)
+/obj/vehicle/sealed/mecha/working/ripley/contents_explosion(severity, target)
for(var/X in cargo)
var/obj/O = X
if(prob(30/severity))
@@ -162,7 +160,7 @@
O.forceMove(drop_location())
. = ..()
-/obj/mecha/working/ripley/get_stats_part()
+/obj/vehicle/sealed/mecha/working/ripley/get_stats_part()
var/output = ..()
output += "
Cargo Compartment Contents:"
if(cargo.len)
@@ -173,7 +171,7 @@
output += "
"
return output
-/obj/mecha/working/ripley/relay_container_resist_act(mob/living/user, obj/O)
+/obj/vehicle/sealed/mecha/working/ripley/relay_container_resist_act(mob/living/user, obj/O)
to_chat(user, "
You lean on the back of [O] and start pushing so it falls out of [src].")
if(do_after(user, 300, target = O))
if(!user || user.stat != CONSCIOUS || user.loc != src || O.loc != src )
@@ -184,20 +182,21 @@
else
if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
to_chat(user, "
You fail to push [O] out of [src]!")
+
/**
* Makes the mecha go faster and halves the mecha drill cooldown if in Lavaland pressure.
*
* Checks for Lavaland pressure, if that works out the mech's speed is equal to fast_pressure_step_in and the cooldown for the mecha drill is halved. If not it uses slow_pressure_step_in and drill cooldown is normal.
*/
-/obj/mecha/working/ripley/proc/update_pressure()
+/obj/vehicle/sealed/mecha/working/ripley/proc/update_pressure()
var/turf/T = get_turf(loc)
if(lavaland_equipment_pressure_check(T))
- step_in = fast_pressure_step_in
+ movedelay = fast_pressure_step_in
for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
drill.equip_cooldown = initial(drill.equip_cooldown) * 0.5
else
- step_in = slow_pressure_step_in
+ movedelay = slow_pressure_step_in
for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
drill.equip_cooldown = initial(drill.equip_cooldown)
diff --git a/code/game/mecha/working/working.dm b/code/modules/vehicles/mecha/working/working.dm
similarity index 84%
rename from code/game/mecha/working/working.dm
rename to code/modules/vehicles/mecha/working/working.dm
index 51213bd110b..5d6a8537152 100644
--- a/code/game/mecha/working/working.dm
+++ b/code/modules/vehicles/mecha/working/working.dm
@@ -1,7 +1,7 @@
-/obj/mecha/working
+/obj/vehicle/sealed/mecha/working
internal_damage_threshold = 60
-/obj/mecha/working/Move()
+/obj/vehicle/sealed/mecha/working/Move()
. = ..()
if(.)
collect_ore()
@@ -11,7 +11,7 @@
*
* Checks for a hydraulic clamp or ore box manager and if it finds an ore box inside them puts ore in the ore box.
*/
-/obj/mecha/working/proc/collect_ore()
+/obj/vehicle/sealed/mecha/working/proc/collect_ore()
if((locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in equipment) || (locate(/obj/item/mecha_parts/mecha_equipment/orebox_manager) in equipment))
var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in contents
if(ore_box)
diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm
index 71805a8e6f0..f69847207e2 100644
--- a/code/modules/vehicles/ridden.dm
+++ b/code/modules/vehicles/ridden.dm
@@ -2,7 +2,7 @@
name = "ridden vehicle"
can_buckle = TRUE
max_buckled_mobs = 1
- buckle_lying = FALSE
+ buckle_lying = 0
default_driver_move = FALSE
var/legs_required = 2
var/arms_required = 1 //why not?
diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm
index 6751ddfe358..e3a019427bf 100644
--- a/code/modules/vehicles/sealed.dm
+++ b/code/modules/vehicles/sealed.dm
@@ -50,10 +50,12 @@
mob_exit(M, silent, randomstep)
/obj/vehicle/sealed/proc/mob_exit(mob/M, silent = FALSE, randomstep = FALSE)
+ SIGNAL_HANDLER
if(!istype(M))
return FALSE
remove_occupant(M)
- M.forceMove(exit_location(M))
+ if(!isAI(M))//This is the ONE mob we dont want to be moved to the vehicle that should be handeled when used
+ M.forceMove(exit_location(M))
if(randomstep)
var/turf/target_turf = get_step(exit_location(M), pick(GLOB.cardinals))
M.throw_at(target_turf, 5, 10)
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index cbb64694286..0e2b9893cfc 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -89,7 +89,7 @@
occupant_actions -= M
return TRUE
-//ACTION DATUMS
+/////////////ACTION DATUMS\\\\\\\\\
/datum/action/vehicle
check_flags = AB_CHECK_RESTRAINED | AB_CHECK_STUN | AB_CHECK_CONSCIOUS
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 1d1bded9308..91ba5605d34 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -920,7 +920,7 @@ GLOBAL_LIST_EMPTY(vending_products)
var/obj/throw_item = null
var/mob/living/target = locate() in view(7,src)
if(!target)
- return 0
+ return FALSE
for(var/datum/data/vending_product/R in shuffle(product_records))
if(R.amount <= 0) //Try to use a record that actually has something to dump.
@@ -933,13 +933,13 @@ GLOBAL_LIST_EMPTY(vending_products)
throw_item = new dump_path(loc)
break
if(!throw_item)
- return 0
+ return FALSE
pre_throw(throw_item)
throw_item.throw_at(target, 16, 3)
visible_message("
[src] launches [throw_item] at [target]!")
- return 1
+ return TRUE
/**
* A callback called before an item is tossed out
*
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index e519372adbe..e4ab27b156b 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -5,8 +5,8 @@
product_slogans = "Liberation Station: Your one-stop shop for all things second amendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!"
product_ads = "Float like an astronaut, sting like a bullet!;Express your second amendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?"
vend_reply = "Remember the name: Liberation Station!"
- products = list(/obj/item/reagent_containers/food/snacks/burger/plain = 5, //O say can you see, by the dawn's early light
- /obj/item/reagent_containers/food/snacks/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
+ products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
+ /obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
/obj/item/reagent_containers/food/snacks/fries = 5, //Whose broad stripes and bright stars through the perilous fight
/obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
@@ -22,10 +22,10 @@
/obj/item/ammo_box/magazine/m45 = 2,
/obj/item/ammo_box/magazine/m75 = 2,
/obj/item/reagent_containers/food/snacks/cheesyfries = 5,
- /obj/item/reagent_containers/food/snacks/burger/baconburger = 5) //Premium burgers for the premium section
+ /obj/item/food/burger/baconburger = 5) //Premium burgers for the premium section
contraband = list(/obj/item/clothing/under/misc/patriotsuit = 3,
/obj/item/bedsheet/patriot = 5,
- /obj/item/reagent_containers/food/snacks/burger/superbite = 3) //U S A
+ /obj/item/food/burger/superbite = 3) //U S A
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
default_price = 150
diff --git a/html/changelog.html b/html/changelog.html
index eb3fe1cafc6..bffed07e4c6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,6 +51,104 @@
-->
+
30 August 2020
+
ArcaneMusic updated:
+
+ - Showers now preform a touch reaction, not a touch/vapor reaction with piped reagents.
+ - You can now build water recyclers in lathes, as intended.
+
+
Ghilker updated:
+
+ - Pressure Valve (a device that allow gas flow in a pipenet if the input pressure is higher than the set pressure)
+
+
Jared-Fogle updated:
+
+ - You can now spray paint anything you want again.
+
+
LemonInTheDark updated:
+
+ - You can no longer increase your view range by messing about with ghostroles
+
+
Qustinnus, 4Dplanner updated:
+
+ - Adds map_generator datums, which will handle terrain generation for a specific area
+ - Adds a jungle generator datum, which uses rust-g noise to generate 3 layers of perlin noise to make a somewhat coheisve and seamless jungle based on height humidity and heat.
+
+
YPOQ updated:
+
+ - Silicons and parrots can speak into their radios again.
+
+
oranges, kryson updated:
+
+ - Added a medal box for the Head Of Personnel
+ - Added the OrdoM memorial medal for paperwork excellence
+
+
qustinnus updated:
+
+ - burgers now composition based
+ - you can now grind bread again
+ - you can now auto-eat things with edible component
+ - food trash element, for dumping trash when u eat food
+
+
+
29 August 2020
+
ATHATH updated:
+
+ - Blob spores from gold slime core and hostile life reactions are now marked as being independent, meaning that they can now drag things, but can no longer freely walk through blob tiles.
+ - Independent blob spores and blobbernauts can now speak over blob chat like overmind-dependent blob mobs do.
+ - Blob spores can no longer damage the environment, for realzies this time. This change does not affect blob zombies.
+ - Removed an unused variable from tech nodes (and the unused proc that references it).
+
+
ArcaneMusic updated:
+
+ - Admins can now spawn the Teambuilding machine for assign teams, like Red or Blue, quickly!
+ - Sinks and showers can now have reagents piped into them.
+ - Using metal sheets on reagent dispensers will now produce a plumbing-enabled supply tank for station use.
+ - Added a new stock part, the water recycler, used in building showers and sinks from scratch.
+ - Hydroponics trays are now plumbing enabled. Water and nutrients will be sorted into their appropriate slots when piped in.
+ - Sinks and showers now have internal water reservoirs, and start filled with water.
+ - Showers and sinks must be constructed from a frame, then finished with a water recycler. remove: Hydroponics hoses have been removed in favor of actual plumbing between machines.
+
+
Donkie updated:
+
+ - Fixed regular pump on map icon north/south being misaligned by 1 pixel
+
+
EdgeLordExe updated:
+
+ - Rust_spread will no longer lag servers into oblivion
+ - Changed a few flavour texts to better represent lore.
+ - Rustbringer's oath now properly only heals while on rusted tiles.
+
+
Helianthus00 updated:
+
+ - Deltastation: made a maint area below the captain's office
+
+
Krysonism updated:
+
+ - granting a mob sentience, with the sentience potion also tames it.
+
+
Melbert updated:
+
+ - You can now remove items from food storage by clicking on them on grab intent.
+ - Componentizes food storage from food/snacks/store.
+
+
TiviPlus updated:
+
+ - A bunch of 1 and 0 use the true/false define now and changed up a bunch of returns
+
+
VexingRaven updated:
+
+ - Plasmaman Supply Kit description now properly lists the envirosuit gloves it contains
+
+
Wayland-Smithy updated:
+
+ - A vulnerability in the AI chamber anti-abduction foil lining has been fixed.
+
+
actioninja updated:
+
+ - Automatic glide size adjustment for smoother movement
+
+
27 August 2020
ATHATH updated:
@@ -2660,79 +2758,6 @@
- ...And they turned the old medipen into a luxury
- Lavaland Extract was found to break laws of physics and was removed from existance
-
-
28 June 2020
-
ATHATH updated:
-
- - Fixed n2o knocking out players for longer than expected.
-
-
ArcaneMusic updated:
-
- - Adds the Cargo Bounty UI as a modular app, with cargo access.
- - The Cargo Bounty UI has been revamped.
- - Cargo tablets now come preinstalled with the price tagger and cargo bounty apps.
-
-
Cyberboss updated:
-
- - TGS4 channel tags will now use ',' as a delimiter to indicate multiple tags.
-
-
EdgeLordExe updated:
-
- - Mansus grasp now wont proc on things it shouldnt proc on, tl;dr you wont loose your charges by missclicking on a tile.
- - Replaced touch of madness with a new fun late game spell
- - Switches positions of blood siphon and cleave
-
-
Fikou updated:
-
- - you can now transmute a pen, a pair of eyes, a bible and human skin into a spare codex cicatrix if you researched some new lore
- - mjolnir now knockdowns instead of stunning
-
-
Hopek updated:
-
- - Tape recorder has been reworked.
-
-
KathyRyals updated:
-
- - The Xray mutation can no longer be obtained via combining radioactive and thermal eyes.
-
-
ShizCalev updated:
-
- - Fixed some bad areacoord messages when teleporting around.
- - Fixed an exploit that would allow you to destroy round-critical / indestructible items with folders.
-
-
XRandomXManX updated:
-
- - Removed Decal Painter from BEPIS Minor Rewards
- - Added Decal Painter to the Basic Tools Research Node
- - Added Decal Painter to Maintenance Loot alongside the Airlock Painter
-
-
necromanceranne updated:
-
- - Added new heretic blade sprites! One for the Ashen Blade, Rusted Blade and Flesh Blade
- - The blades have some descriptions now.
- - Fixed some infiltrator toolbox sprites (hopefully).
- - Some eldritch items have had their descriptions and text altered to be a bit more legible and flavourful.
-
-
nightred updated:
-
- - Service department area update on Meta
- - Stackers deposit to the silo when picking up stacks from the input side.
-
-
silicons updated:
-
- - An explosion compressor has been added to science. It makes raw anomaly cores into proper anomaly cores using prepared TTVs of a specific required blast radius.
-
-
-
27 June 2020
-
Ryll/Shaps updated:
-
- - Too much bone hurting juice REALLY hurts your bones, oof.
-
-
Tlaltecuhtli updated:
-
- - the nanotransen research science division found that epinephrine has healing effects to people who drank lexorin
- - eye stabbing returns a normal attack if it fails instead of doing nothing
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 18568ad1b2e..22cc54d7889 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -42389,3 +42389,82 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
break the panel.'
- admin: Unthickened hrefs.log (no more ping hrefs)
- admin: Thickened tgui.log (logs actions, interacted object and mob location)
+2020-08-29:
+ ATHATH:
+ - bugfix: Blob spores from gold slime core and hostile life reactions are now marked
+ as being independent, meaning that they can now drag things, but can no longer
+ freely walk through blob tiles.
+ - balance: Independent blob spores and blobbernauts can now speak over blob chat
+ like overmind-dependent blob mobs do.
+ - bugfix: Blob spores can no longer damage the environment, for realzies this time.
+ This change does not affect blob zombies.
+ - rscdel: Removed an unused variable from tech nodes (and the unused proc that references
+ it).
+ ArcaneMusic:
+ - rscadd: Admins can now spawn the Teambuilding machine for assign teams, like Red
+ or Blue, quickly!
+ - rscadd: Sinks and showers can now have reagents piped into them.
+ - rscadd: Using metal sheets on reagent dispensers will now produce a plumbing-enabled
+ supply tank for station use.
+ - rscadd: Added a new stock part, the water recycler, used in building showers and
+ sinks from scratch.
+ - rscadd: Hydroponics trays are now plumbing enabled. Water and nutrients will be
+ sorted into their appropriate slots when piped in.
+ - tweak: Sinks and showers now have internal water reservoirs, and start filled
+ with water.
+ - tweak: 'Showers and sinks must be constructed from a frame, then finished with
+ a water recycler. remove: Hydroponics hoses have been removed in favor of actual
+ plumbing between machines.'
+ Donkie:
+ - bugfix: Fixed regular pump on map icon north/south being misaligned by 1 pixel
+ EdgeLordExe:
+ - tweak: Rust_spread will no longer lag servers into oblivion
+ - tweak: Changed a few flavour texts to better represent lore.
+ - bugfix: Rustbringer's oath now properly only heals while on rusted tiles.
+ Helianthus00:
+ - tweak: 'Deltastation: made a maint area below the captain''s office'
+ Krysonism:
+ - tweak: granting a mob sentience, with the sentience potion also tames it.
+ Melbert:
+ - tweak: You can now remove items from food storage by clicking on them on grab
+ intent.
+ - code_imp: Componentizes food storage from food/snacks/store.
+ TiviPlus:
+ - refactor: A bunch of 1 and 0 use the true/false define now and changed up a bunch
+ of returns
+ VexingRaven:
+ - tweak: Plasmaman Supply Kit description now properly lists the envirosuit gloves
+ it contains
+ Wayland-Smithy:
+ - bugfix: A vulnerability in the AI chamber anti-abduction foil lining has been
+ fixed.
+ actioninja:
+ - rscadd: Automatic glide size adjustment for smoother movement
+2020-08-30:
+ ArcaneMusic:
+ - bugfix: Showers now preform a touch reaction, not a touch/vapor reaction with
+ piped reagents.
+ - bugfix: You can now build water recyclers in lathes, as intended.
+ Ghilker:
+ - rscadd: Pressure Valve (a device that allow gas flow in a pipenet if the input
+ pressure is higher than the set pressure)
+ Jared-Fogle:
+ - rscadd: You can now spray paint anything you want again.
+ LemonInTheDark:
+ - bugfix: You can no longer increase your view range by messing about with ghostroles
+ Qustinnus, 4Dplanner:
+ - rscadd: Adds map_generator datums, which will handle terrain generation for a
+ specific area
+ - rscadd: Adds a jungle generator datum, which uses rust-g noise to generate 3 layers
+ of perlin noise to make a somewhat coheisve and seamless jungle based on height
+ humidity and heat.
+ YPOQ:
+ - bugfix: Silicons and parrots can speak into their radios again.
+ oranges, kryson:
+ - rscadd: Added a medal box for the Head Of Personnel
+ - rscadd: Added the OrdoM memorial medal for paperwork excellence
+ qustinnus:
+ - code_imp: burgers now composition based
+ - bugfix: you can now grind bread again
+ - rscadd: you can now auto-eat things with edible component
+ - code_imp: food trash element, for dumping trash when u eat food
diff --git a/html/changelogs/AutoChangeLog-pr-52515.yml b/html/changelogs/AutoChangeLog-pr-52515.yml
deleted file mode 100644
index 9707ca8e716..00000000000
--- a/html/changelogs/AutoChangeLog-pr-52515.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes:
- - rscadd: "Automatic glide size adjustment for smoother movement"
diff --git a/html/changelogs/AutoChangeLog-pr-52680.yml b/html/changelogs/AutoChangeLog-pr-52680.yml
deleted file mode 100644
index df78a80d47c..00000000000
--- a/html/changelogs/AutoChangeLog-pr-52680.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EdgeLordExe"
-delete-after: True
-changes:
- - tweak: "Rust_spread will no longer lag servers into oblivion"
- - tweak: "Changed a few flavour texts to better represent lore."
- - bugfix: "Rustbringer's oath now properly only heals while on rusted tiles."
diff --git a/html/changelogs/AutoChangeLog-pr-52865.yml b/html/changelogs/AutoChangeLog-pr-52865.yml
deleted file mode 100644
index 4e7ce03ac2a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-52865.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "ArcaneMusic"
-delete-after: True
-changes:
- - rscadd: "Sinks and showers can now have reagents piped into them."
- - rscadd: "Using metal sheets on reagent dispensers will now produce a plumbing-enabled supply tank for station use."
- - rscadd: "Added a new stock part, the water recycler, used in building showers and sinks from scratch."
- - rscadd: "Hydroponics trays are now plumbing enabled. Water and nutrients will be sorted into their appropriate slots when piped in."
- - tweak: "Sinks and showers now have internal water reservoirs, and start filled with water."
- - tweak: "Showers and sinks must be constructed from a frame, then finished with a water recycler.
-remove: Hydroponics hoses have been removed in favor of actual plumbing between machines."
diff --git a/html/changelogs/AutoChangeLog-pr-52902.yml b/html/changelogs/AutoChangeLog-pr-52902.yml
new file mode 100644
index 00000000000..54e180e53ec
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-52902.yml
@@ -0,0 +1,4 @@
+author: "TiviPlus"
+delete-after: True
+changes:
+ - refactor: "Mech refactor"
diff --git a/html/changelogs/AutoChangeLog-pr-52941.yml b/html/changelogs/AutoChangeLog-pr-52941.yml
new file mode 100644
index 00000000000..0e28557da2c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-52941.yml
@@ -0,0 +1,4 @@
+author: "Ghilker"
+delete-after: True
+changes:
+ - rscadd: "Added Crystal Invasion Event (with all the mechanics, mobs and item related)"
diff --git a/html/changelogs/AutoChangeLog-pr-53005.yml b/html/changelogs/AutoChangeLog-pr-53005.yml
deleted file mode 100644
index 21d2f657f5e..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53005.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Wayland-Smithy"
-delete-after: True
-changes:
- - bugfix: "A vulnerability in the AI chamber anti-abduction foil lining has been fixed."
diff --git a/html/changelogs/AutoChangeLog-pr-53083.yml b/html/changelogs/AutoChangeLog-pr-53083.yml
new file mode 100644
index 00000000000..e0191ab9974
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-53083.yml
@@ -0,0 +1,4 @@
+author: "Dennok"
+delete-after: True
+changes:
+ - tweak: "ladders keep its menu opened when you use ladder"
diff --git a/html/changelogs/AutoChangeLog-pr-53116.yml b/html/changelogs/AutoChangeLog-pr-53116.yml
deleted file mode 100644
index c9b00f796c1..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53116.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Melbert"
-delete-after: True
-changes:
- - tweak: "You can now remove items from food storage by clicking on them on grab intent."
- - code_imp: "Componentizes food storage from food/snacks/store."
diff --git a/html/changelogs/AutoChangeLog-pr-53147.yml b/html/changelogs/AutoChangeLog-pr-53147.yml
deleted file mode 100644
index 541274ede5a..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53147.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ArcaneMusic"
-delete-after: True
-changes:
- - rscadd: "Admins can now spawn the Teambuilding machine for assign teams, like Red or Blue, quickly!"
diff --git a/html/changelogs/AutoChangeLog-pr-53167.yml b/html/changelogs/AutoChangeLog-pr-53167.yml
deleted file mode 100644
index dbcb2b1e9fc..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53167.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Krysonism"
-delete-after: True
-changes:
- - tweak: "granting a mob sentience, with the sentience potion also tames it."
diff --git a/html/changelogs/AutoChangeLog-pr-53178.yml b/html/changelogs/AutoChangeLog-pr-53178.yml
deleted file mode 100644
index af0ca113d46..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53178.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "VexingRaven"
-delete-after: True
-changes:
- - tweak: "Plasmaman Supply Kit description now properly lists the envirosuit gloves it contains"
diff --git a/html/changelogs/AutoChangeLog-pr-53188.yml b/html/changelogs/AutoChangeLog-pr-53188.yml
deleted file mode 100644
index e6805957046..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53188.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "ATHATH"
-delete-after: True
-changes:
- - bugfix: "Blob spores from gold slime core and hostile life reactions are now marked as being independent, meaning that they can now drag things, but can no longer freely walk through blob tiles."
- - balance: "Independent blob spores and blobbernauts can now speak over blob chat like overmind-dependent blob mobs do."
- - bugfix: "Blob spores can no longer damage the environment, for realzies this time. This change does not affect blob zombies."
diff --git a/html/changelogs/AutoChangeLog-pr-53214.yml b/html/changelogs/AutoChangeLog-pr-53214.yml
deleted file mode 100644
index d9232bb46f3..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53214.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ATHATH"
-delete-after: True
-changes:
- - rscdel: "Removed an unused variable from tech nodes (and the unused proc that references it)."
diff --git a/html/changelogs/AutoChangeLog-pr-53216.yml b/html/changelogs/AutoChangeLog-pr-53216.yml
deleted file mode 100644
index de06ca4aea8..00000000000
--- a/html/changelogs/AutoChangeLog-pr-53216.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Donkie"
-delete-after: True
-changes:
- - bugfix: "Fixed regular pump on map icon north/south being misaligned by 1 pixel"
diff --git a/html/changelogs/AutoChangeLog-pr-53233.yml b/html/changelogs/AutoChangeLog-pr-53233.yml
new file mode 100644
index 00000000000..7731205c44a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-53233.yml
@@ -0,0 +1,5 @@
+author: "LemonInTheDark"
+delete-after: True
+changes:
+ - rscadd: "H2O is a bit more spicy in the sm, and plux is now a danger rather then a gift, filter it out you nerds."
+ - balance: "You feel a great shift in space, the spice rock has changed"
diff --git a/html/changelogs/AutoChangeLog-pr-53287.yml b/html/changelogs/AutoChangeLog-pr-53287.yml
new file mode 100644
index 00000000000..13ccdabec67
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-53287.yml
@@ -0,0 +1,7 @@
+author: "Helianthus00"
+delete-after: True
+changes:
+ - rscadd: "Added 2 new subtypes of gas meter so that they work on layers 1 and 3"
+ - bugfix: "Deltastation: Fixes some broken gas meters to be on the correct layer"
+ - bugfix: "Icebox station: Fixes some broken gas meters to be on the correct layer, as well as relocating the random ones in maint to actual pipes"
+ - bugfix: "Pubbystation: Fixes some broken gas meters to be on the correct layer"
diff --git a/html/changelogs/AutoChangeLog-pr-53317.yml b/html/changelogs/AutoChangeLog-pr-53317.yml
new file mode 100644
index 00000000000..a80c9a1602a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-53317.yml
@@ -0,0 +1,4 @@
+author: "TiviPlus"
+delete-after: True
+changes:
+ - bugfix: "fixed overlay lighting sometimes displaying offset"
diff --git a/html/statbrowser.html b/html/statbrowser.html
index f8d6df48dea..db582457869 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -9,8 +9,8 @@
body {
font-family: Verdana, Geneva, Tahoma, sans-serif;
font-size: 12px !important;
- margin: 5px !important;
- padding: 2px !important;
+ margin: 0 !important;
+ padding: 0 !important;
}
body.dark {
background-color: #131313;
@@ -19,11 +19,18 @@ body.dark {
#menu {
background-color: white;
+ position: fixed;
+ padding: 7px;
+ width: 100%;
}
.dark #menu {
background-color: #131313;
}
+#statcontent {
+ padding: 0 7px 7px 7px;
+}
+
a {
color: black;
text-decoration: none
@@ -142,6 +149,7 @@ li a:hover:not(.active) {
+