diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index b0d1a1e15f..332abc11bd 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -17830,7 +17830,7 @@
/turf/open/floor/wood,
/area/service/bar)
"aRx" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/wood,
/area/service/bar)
"aRy" = (
@@ -60122,7 +60122,7 @@
/turf/open/floor/plasteel,
/area/commons/dorms)
"nZL" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"oax" = (
@@ -64938,7 +64938,7 @@
/turf/open/floor/plasteel,
/area/security/prison/upper)
"vim" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
icon_state = "1-2"
diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm
index 74debaa989..c5e8df8ed2 100644
--- a/_maps/map_files/CogStation/CogStation.dmm
+++ b/_maps/map_files/CogStation/CogStation.dmm
@@ -858,7 +858,7 @@
/turf/open/floor/plating/airless,
/area/router/aux)
"acf" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
"acg" = (
@@ -4505,7 +4505,7 @@
/area/maintenance/solars/starboard/fore)
"alg" = (
/obj/structure/frame/machine,
-/obj/item/circuitboard/computer/arcade/minesweeper,
+/obj/item/circuitboard/computer/arcade/orion_trail,
/turf/open/floor/plating,
/area/construction/secondary)
"alh" = (
diff --git a/_maps/map_files/LambdaStation/dorms.dmm b/_maps/map_files/LambdaStation/dorms.dmm
index afe85da6cc..e1133584b8 100644
--- a/_maps/map_files/LambdaStation/dorms.dmm
+++ b/_maps/map_files/LambdaStation/dorms.dmm
@@ -9501,7 +9501,7 @@
/obj/machinery/camera/autoname{
dir = 4
},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
dir = 4
},
/turf/open/floor/plasteel,
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 5b5885aca6..cc78b62bdc 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -70208,7 +70208,7 @@
},
/area/command/gateway)
"pCQ" = (
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/battle{
dir = 4
},
/turf/open/floor/plasteel,
diff --git a/_maps/map_files/Snaxi/Snaxi.dmm b/_maps/map_files/Snaxi/Snaxi.dmm
index d9cf6c7948..1db8a64a97 100644
--- a/_maps/map_files/Snaxi/Snaxi.dmm
+++ b/_maps/map_files/Snaxi/Snaxi.dmm
@@ -870,7 +870,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
dir = 8
},
/obj/structure/sign/poster/official/nanomichi_ad{
@@ -5842,7 +5842,7 @@
/turf/open/floor/plating,
/area/maintenance/aft/secondary)
"akQ" = (
-/obj/machinery/computer/arcade/minesweeper,
+/obj/machinery/computer/arcade/battle,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"akR" = (
@@ -34938,7 +34938,7 @@
dir = 1;
pixel_y = -24
},
-/obj/machinery/computer/arcade/minesweeper{
+/obj/machinery/computer/arcade/orion_trail{
dir = 4
},
/turf/open/floor/plasteel/dark,
diff --git a/auxmos.dll b/auxmos.dll
index 52e01b515a..d16063c4e4 100644
Binary files a/auxmos.dll and b/auxmos.dll differ
diff --git a/auxmos.pdb b/auxmos.pdb
index 0f5a534a12..86b751346e 100644
Binary files a/auxmos.pdb and b/auxmos.pdb differ
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 869a6e93dc..0e29e80245 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -326,7 +326,7 @@ SUBSYSTEM_DEF(vote)
return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
GLOB.master_mode = "dynamic"
if(. == "extended")
- GLOB.dynamic_forced_extended = TRUE
+ GLOB.dynamic_extended = TRUE
message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
log_admin("Gamemode has been voted for and switched to: [GLOB.master_mode].")
if("restart")
diff --git a/code/datums/atmosphere/planetary.dm b/code/datums/atmosphere/planetary.dm
index f1d2e85755..081777a247 100644
--- a/code/datums/atmosphere/planetary.dm
+++ b/code/datums/atmosphere/planetary.dm
@@ -7,9 +7,9 @@
GAS_N2=10,
)
normal_gases = list(
- GAS_O2=10,
- GAS_N2=10,
- GAS_CO2=10,
+ GAS_O2=5,
+ GAS_N2=5,
+ GAS_CO2=5,
)
restricted_gases = list(
GAS_BZ=0.1,
diff --git a/code/datums/components/crafting/recipes/recipes_primal.dm b/code/datums/components/crafting/recipes/recipes_primal.dm
index 73401a4198..ad71db7c59 100644
--- a/code/datums/components/crafting/recipes/recipes_primal.dm
+++ b/code/datums/components/crafting/recipes/recipes_primal.dm
@@ -295,6 +295,16 @@
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
+/datum/crafting_recipe/bone_anvil
+ name = "Bone Anvil"
+ result = /obj/structure/anvil/obtainable/bone
+ time = 200
+ reqs = list(/obj/item/stack/sheet/bone = 6,
+ /obj/item/stack/sheet/sinew = 2,
+ /obj/item/stack/sheet/animalhide/goliath_hide = 2)
+ tools = list(/obj/item/weldingtool/experimental/ashwalker, /obj/item/wirecutters/ashwalker, /obj/item/crowbar/ashwalker)
+ category = CAT_PRIMAL
+
/datum/crafting_recipe/bone_glaive
name = "Necropolis Glaive"
result = /obj/item/kinetic_crusher/glaive/bone
diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
index a6496622ff..5bf6b8642c 100644
--- a/code/datums/materials/basemats.dm
+++ b/code/datums/materials/basemats.dm
@@ -362,6 +362,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
color = "#e3dac9"
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/bone
+ strength_modifier = 1.05
value_per_unit = 0.05
armor_modifiers = list("melee" = 1.2, "bullet" = 0.75, "laser" = 0.75, "energy" = 1.2, "bomb" = 1, "bio" = 1, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
beauty_modifier = -0.2
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index e44e8faeca..cbd9c6c8c6 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -1,13 +1,16 @@
#define RULESET_STOP_PROCESSING 1
-#define FAKE_REPORT_CHANCE 8
+#define FAKE_REPORT_CHANCE 20
#define REPORT_NEG_DIVERGENCE -15
#define REPORT_POS_DIVERGENCE 15
+#define EXTENDED_CURVE_CENTER -7
// Are HIGH_IMPACT_RULESETs allowed to stack?
GLOBAL_VAR_INIT(dynamic_no_stacking, TRUE)
// If enabled does not accept or execute any rulesets.
GLOBAL_VAR_INIT(dynamic_forced_extended, FALSE)
+// Antags still allowed, but no roundstart antags + midrounds are low impact
+GLOBAL_VAR_INIT(dynamic_extended, FALSE)
// How high threat is required for HIGH_IMPACT_RULESETs stacking.
// This is independent of dynamic_no_stacking.
GLOBAL_VAR_INIT(dynamic_stacking_limit, 90)
@@ -163,6 +166,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
dat += "Split parameters: centre = [roundstart_split_curve_centre] ; width = [roundstart_split_curve_width]. "
dat += "On average, [peaceful_percentage]% of the rounds are more peaceful. "
dat += "Forced extended: [GLOB.dynamic_forced_extended ? "On" : "Off"] "
+ dat += "Dynamic extended: [GLOB.dynamic_extended ? "On" : "Off"] "
dat += "No stacking (only one round-ender): [GLOB.dynamic_no_stacking ? "On" : "Off"] "
dat += "Stacking limit: [GLOB.dynamic_stacking_limit] \[Adjust\]"
dat += " "
@@ -192,6 +196,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
return
if (href_list["forced_extended"])
GLOB.dynamic_forced_extended = !GLOB.dynamic_forced_extended
+ else if (href_list["extended"])
+ GLOB.dynamic_extended = !GLOB.dynamic_extended
else if (href_list["no_stacking"])
GLOB.dynamic_no_stacking = !GLOB.dynamic_no_stacking
else if (href_list["adjustthreat"])
@@ -309,9 +315,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Generates the threat level using lorentz distribution and assigns peaceful_percentage.
/datum/game_mode/dynamic/proc/generate_threat()
+ if(GLOB.dynamic_extended)
+ threat_curve_centre = EXTENDED_CURVE_CENTER
var/relative_threat = LORENTZ_DISTRIBUTION(threat_curve_centre, threat_curve_width)
threat_level = round(lorentz_to_amount(relative_threat), 0.1)
-
peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, threat_curve_centre, threat_curve_width), 0.01)*100
SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Initial threat level")
@@ -321,14 +328,18 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Generates the midround and roundstart budgets
/datum/game_mode/dynamic/proc/generate_budgets()
- var/relative_round_start_budget_scale = LORENTZ_DISTRIBUTION(roundstart_split_curve_centre, roundstart_split_curve_width)
- round_start_budget = round((lorentz_to_amount(relative_round_start_budget_scale) / 100) * threat_level, 0.1)
- initial_round_start_budget = round_start_budget
- mid_round_budget = threat_level - round_start_budget
+ if(GLOB.dynamic_extended)
+ mid_round_budget = threat_level
+ round_start_budget = 0
+ else
+ var/relative_round_start_budget_scale = LORENTZ_DISTRIBUTION(roundstart_split_curve_centre, roundstart_split_curve_width)
+ round_start_budget = round((lorentz_to_amount(relative_round_start_budget_scale) / 100) * threat_level, 0.1)
+ initial_round_start_budget = round_start_budget
+ mid_round_budget = threat_level - round_start_budget
/datum/game_mode/dynamic/proc/setup_parameters()
log_game("DYNAMIC: Dynamic mode parameters for the round:")
- log_game("DYNAMIC: Centre is [threat_curve_centre], Width is [threat_curve_width], Forced extended is [GLOB.dynamic_forced_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
+ log_game("DYNAMIC: Centre is [threat_curve_centre], Width is [threat_curve_width], Extended is [GLOB.dynamic_extended ? "Enabled" : "Disabled"], No stacking is [GLOB.dynamic_no_stacking ? "Enabled" : "Disabled"].")
log_game("DYNAMIC: Stacking limit is [GLOB.dynamic_stacking_limit].")
if(GLOB.dynamic_forced_threat_level >= 0)
threat_level = round(GLOB.dynamic_forced_threat_level, 0.1)
@@ -346,9 +357,15 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
shown_threat = clamp(threat_level + rand(REPORT_NEG_DIVERGENCE, REPORT_POS_DIVERGENCE), 0, 100)
/datum/game_mode/dynamic/proc/set_cooldowns()
+ var/coeff = GLOB.dynamic_extended ? 2 : 1
+ latejoin_delay_min *= coeff
+ latejoin_delay_max *= coeff
var/latejoin_injection_cooldown_middle = 0.5*(latejoin_delay_max + latejoin_delay_min)
latejoin_injection_cooldown = round(clamp(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), latejoin_delay_min, latejoin_delay_max)) + world.time
+ midround_delay_min *= coeff
+ midround_delay_max *= coeff
+
var/midround_injection_cooldown_middle = 0.5*(midround_delay_max + midround_delay_min)
midround_injection_cooldown = round(clamp(EXP_DISTRIBUTION(midround_injection_cooldown_middle), midround_delay_min, midround_delay_max)) + world.time
@@ -456,6 +473,9 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if (GLOB.dynamic_forced_extended)
log_game("DYNAMIC: Starting a round of forced extended.")
return TRUE
+ if (GLOB.dynamic_extended)
+ log_game("DYNAMIC: Starting a round of dynamic extended.")
+ return TRUE
var/list/drafted_rules = list()
for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules)
if (!rule.weight)
@@ -563,9 +583,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
return FALSE
// Check if the ruleset is high impact and if a high impact ruleset has been executed
else if(new_rule.flags & HIGH_IMPACT_RULESET)
- if(threat_level < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
- if(high_impact_ruleset_executed)
- return FALSE
+ if(GLOB.dynamic_extended)
+ return FALSE
+ if(high_impact_ruleset_executed && threat_level < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+ return FALSE
var/population = current_players[CURRENT_LIVING_PLAYERS].len
if((new_rule.acceptable(population, threat_level) && new_rule.cost <= mid_round_budget) || forced)
@@ -598,8 +619,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/datum/game_mode/dynamic/proc/midround_rule_draft()
set waitfor = FALSE
if (midround_injection_cooldown < world.time)
- /*if (GLOB.dynamic_forced_extended)
- return*/
+ if (GLOB.dynamic_forced_extended)
+ return
// Somehow it managed to trigger midround multiple times so this was moved here.
// There is no way this should be able to trigger an injection twice now.
@@ -620,6 +641,11 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
for (var/datum/dynamic_ruleset/midround/rule in midround_rules)
if (!rule.weight)
continue
+ if(rule.flags & HIGH_IMPACT_RULESET)
+ if (high_impact_ruleset_executed && threat_level < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
+ continue
+ if(GLOB.dynamic_extended)
+ continue
if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && mid_round_budget >= rule.cost)
rule.trim_candidates()
if (rule.ready())
@@ -642,11 +668,17 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
forced_injection = dry_run
return 100
var/chance = 0
- var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(current_players[CURRENT_LIVING_PLAYERS].len/5))
+ var/effective_living_players = current_players[CURRENT_LIVING_PLAYERS].len
+ if(GLOB.dynamic_extended)
+ effective_living_players = min(effective_living_players, length(SSjob.get_living_sec())*2 + length(SSjob.get_living_heads()))
+ var/max_pop_per_antag = max(5,15 - round(threat_level/10) - round(effective_living_players/5))
if (!current_players[CURRENT_LIVING_ANTAGS].len)
- chance += 50 // No antags at all? let's boost those odds!
+ if(GLOB.dynamic_extended)
+ chance += min(50,effective_living_players*5)
+ else
+ chance += 50 // No antags at all? let's boost those odds!
else
- var/current_pop_per_antag = current_players[CURRENT_LIVING_PLAYERS].len / current_players[CURRENT_LIVING_ANTAGS].len
+ var/current_pop_per_antag = effective_living_players / current_players[CURRENT_LIVING_ANTAGS].len
if (current_pop_per_antag > max_pop_per_antag)
chance += min(50, 25+10*(current_pop_per_antag-max_pop_per_antag))
else
diff --git a/code/game/machinery/autoloom.dm b/code/game/machinery/autoloom.dm
new file mode 100644
index 0000000000..f290ac1a96
--- /dev/null
+++ b/code/game/machinery/autoloom.dm
@@ -0,0 +1,102 @@
+// like a recycler, but for plants only ig
+/obj/machinery/autoloom
+ name = "autoloom"
+ desc = "A large processing machine used to process raw biological matter, like cotton or logs. It also looks like a recycler. There's a display on the side."
+ icon = 'icons/obj/recycling.dmi'
+ icon_state = "grinder-o0"
+ layer = ABOVE_ALL_MOB_LAYER // Overhead
+ density = TRUE
+ circuit = /obj/item/circuitboard/machine/autoloom
+ var/icon_name = "grinder-o"
+ var/eat_dir = WEST
+ var/process_efficiency = 0
+ var/static/list/can_process = typecacheof(list(
+ /obj/item/stack/sheet/cotton,
+ /obj/item/grown/log,
+ /obj/item/grown/cotton
+ ))
+
+/obj/machinery/autoloom/RefreshParts()
+ for(var/obj/item/stock_parts/manipulator/M in component_parts)
+ process_efficiency = M.rating
+
+/obj/machinery/recycler/examine(mob/user)
+ . = ..()
+ . += "Biomatter processing efficiency at [amount_produced*100]%."
+
+/obj/machinery/autoloom/power_change()
+ ..()
+ update_icon()
+
+/obj/machinery/autoloom/attackby(obj/item/I, mob/user, params)
+ if(default_deconstruction_screwdriver(user, "grinder-oOpen", "grinder-o0", I))
+ return
+
+ if(default_pry_open(I))
+ return
+
+ if(default_unfasten_wrench(user, I))
+ return
+
+ if(default_deconstruction_crowbar(I))
+ return
+ return ..()
+
+/obj/machinery/autoloom/update_icon_state()
+ var/is_powered = !(stat & (BROKEN|NOPOWER))
+ icon_state = icon_name + "[is_powered]" // add the blood tag at the end
+
+/obj/machinery/autoloom/CanPass(atom/movable/AM)
+ . = ..()
+ if(!anchored)
+ return
+
+ var/move_dir = get_dir(loc, AM.loc)
+ if(move_dir == eat_dir)
+ return TRUE
+
+/obj/machinery/autoloom/Crossed(atom/movable/AM)
+ eat(AM)
+ . = ..()
+
+/obj/machinery/autoloom/proc/eat(atom/movable/AM0, sound=TRUE)
+ if(stat & (BROKEN|NOPOWER))
+ return
+ if(!isturf(AM0.loc))
+ return //I don't know how you called Crossed() but stop it.
+
+ if(is_type_in_list(AM0, can_process))
+ process_item(AM0)
+
+/obj/machinery/autoloom/proc/process_item(obj/item/I)
+ . = list()
+ for(var/A in I)
+ var/atom/movable/AM = A
+ AM.forceMove(loc)
+ if(AM.loc == loc)
+ . += AM
+
+ I.forceMove(loc)
+ if(istype(I, /obj/item/grown/log))
+ var/obj/item/grown/log/L = I
+ var/seed_modifier = 0
+ if(L.seed)
+ seed_modifier = round(L.seed.potency / 25)
+ new L.plank_type(src.loc, process_efficiency + seed_modifier)
+ qdel(L)
+ return
+
+ if(istype(I, /obj/item/stack/sheet/cotton))
+ var/obj/item/stack/sheet/cotton/RS = I
+ var/tomake = round((RS.amount / 4) * process_efficiency)
+ new RS.loom_result(src.loc, tomake)
+ qdel(RS)
+ return
+
+ if(istype(I, /obj/item/grown/cotton))
+ var/obj/item/grown/cotton/RC = I
+ var/cottonAmt = 1 + round(RC.seed.potency / 25)
+ var/newRaw = new RC.cotton_type(src.loc, cottonAmt)
+ qdel(RC)
+ process_item(newRaw)
+ return
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index dd2ebf287f..e430ac469f 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -82,9 +82,8 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
// If it's a generic arcade machine, pick a random arcade
// circuit board for it and make the new machine
if(!circuit)
- var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 33,
- /obj/item/circuitboard/computer/arcade/orion_trail = 33,
- /obj/item/circuitboard/computer/arcade/minesweeper = 33,
+ var/list/gameodds = list(/obj/item/circuitboard/computer/arcade/battle = 50,
+ /obj/item/circuitboard/computer/arcade/orion_trail = 50,
/obj/item/circuitboard/computer/arcade/amputation = 2)
var/thegame = pickweight(gameodds)
var/obj/item/circuitboard/CB = new thegame()
diff --git a/code/game/machinery/computer/arcade/minesweeper.dm b/code/game/machinery/computer/arcade/minesweeper.dm
deleted file mode 100644
index c9c5b30794..0000000000
--- a/code/game/machinery/computer/arcade/minesweeper.dm
+++ /dev/null
@@ -1,413 +0,0 @@
-#define MINESWEEPER_GAME_MAIN_MENU 0
-#define MINESWEEPER_GAME_PLAYING 1
-#define MINESWEEPER_GAME_LOST 2
-#define MINESWEEPER_GAME_WON 3
-#define MINESWEEPERIMG(what) {""} //Basically bypassing asset.icon_tag()
-
-/obj/machinery/computer/arcade/minesweeper
- name = "Minesweeper"
- desc = "An arcade machine that generates grids. It seems that the machine sparks and screeches when a grid is generated, as if it cannot cope with the intensity of generating the grid."
- icon_state = "arcade"
- circuit = /obj/item/circuitboard/computer/arcade/minesweeper
- var/area
- var/difficulty = "" //To show what difficulty you are playing
- var/flag_text = ""
- var/flagging = FALSE
- var/game_status = MINESWEEPER_GAME_MAIN_MENU
- var/mine_limit = 0
- var/mine_placed = 0
- var/mine_sound = TRUE //So it doesn't get repeated when multiple mines are exposed
- var/randomcolour = 1
- var/randomnumber = 1 //Random emagged game iteration number to be displayed, put here so it is persistent across one individual arcade machine
- var/safe_squares_revealed
- var/saved_web = "" //To display the web if you click on the arcade
- var/win_condition
- var/rows = 1
- var/columns = 1
- var/table[31][51] //Make the board boys, 30x50 board
- var/spark_spam = FALSE
-
-/obj/machinery/computer/arcade/minesweeper/interact(mob/user)
- var/emagged = CHECK_BITFIELD(obj_flags, EMAGGED)
- var/dat
- if(game_status == MINESWEEPER_GAME_MAIN_MENU)
- dat += "Minesweeper
Minesweeper[emagged ? " EXTREME EDITION: Iteration #[randomnumber]" : ""] " //Different colour mix for every random number made
- dat += " [emagged ? "Explode in the game, explode in real life" : "Reveal all the squares without hitting a mine"]! What difficulty do you want to play?
"
-
- web += ""
- var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/simple/minesweeper)
- saved_web = sheet.css_tag()
- saved_web += web
- updateDialog()
- return
-
-/obj/machinery/computer/arcade/minesweeper/emag_act(mob/user)
- . = ..()
- if(CHECK_BITFIELD(obj_flags, EMAGGED))
- return
- desc = "An arcade machine that generates grids. It's clunking and sparking everywhere, almost as if threatening to explode at any moment!"
- do_sparks(5, 1, src)
- randomnumber = rand(1,255)
- randomcolour = rgb(randomnumber,randomnumber/2,randomnumber/3)
- ENABLE_BITFIELD(obj_flags, EMAGGED)
- if(game_status == MINESWEEPER_GAME_MAIN_MENU)
- to_chat(user, "An ominous tune plays from the arcade's speakers!")
- playsound(user, 'sound/arcade/minesweeper_emag1.ogg', 100, FALSE, extrarange = 3)
- else //Can't let you do that, star fox!
- to_chat(user, "The machine buzzes and sparks... the game has been reset!")
- playsound(user, 'sound/machines/buzz-sigh.ogg', 100, FALSE, extrarange = 3) //Loud buzz
- game_status = MINESWEEPER_GAME_MAIN_MENU
- return TRUE
-
-/obj/machinery/computer/arcade/minesweeper/proc/custom_generation(mob/user)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3) //Entered into the menu so ping sound
- var/new_rows = tgui_input_num(user, "How many rows do you want? (Minimum: 4, Maximum: 30)", "Minesweeper Rows")
- if(!new_rows || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- new_rows = clamp(new_rows + 1, 4, 20)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3)
- var/new_columns = tgui_input_num(user, "How many columns do you want? (Minimum: 4, Maximum: 50)", "Minesweeper Squares")
- if(!new_columns || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- new_columns = clamp(new_columns + 1, 4, 30)
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3)
- var/grid_area = (new_rows - 1) * (new_columns - 1)
- var/lower_limit = round(grid_area*0.156)
- var/upper_limit = round(grid_area*0.85)
- var/new_mine_limit = tgui_input_num(user, "How many mines do you want? (Minimum: [lower_limit], Maximum: [upper_limit])", "Minesweeper Mines")
- if(!new_mine_limit || !user.canUseTopic(src, !hasSiliconAccessInArea(user)))
- return FALSE
- playsound(loc, 'sound/arcade/minesweeper_menuselect.ogg', 50, FALSE, extrarange = -3)
- rows = new_rows
- columns = new_columns
- mine_limit = clamp(new_mine_limit, lower_limit, upper_limit)
- return TRUE
-
-/obj/machinery/computer/arcade/minesweeper/proc/make_mines(var/reset_everything)
- if(mine_placed < mine_limit)
- for(var/y1=1;y1 0 && x3 > 0)
- y2 = y3
- x2 = x3
- if(table[y2][x2] == 1)
- for(y3=y2-1;y3= rows || y3 < 1)
- continue
- for(x3=x2-1;x3= columns || x3 < 1)
- continue
- if(table[y3][x3] == 0)
- table[y2][x2] += 1
- if(table[y2][x2] == 11)
- for(y3=y2-1;y3= rows || y3 < 1)
- continue
- for(x3=x2-1;x3= columns || x3 < 1)
- continue
- if(table[y3][x3] > 0 && table[y3][x3] < 10)
- table[y3][x3] += 10
- work_squares(y3, x3) //Refresh so we check everything we might be missing
-
-/obj/machinery/computer/arcade/minesweeper/proc/explode_EVERYTHING()
- var/mob/living/user = usr
- to_chat(user, "You feel a great sense of dread wash over you, as if you just unleashed armageddon upon yourself!")
- var/row_limit = rows-1
- var/column_limit = columns-1
- var/mine_limit_v2 = mine_limit
- if(rows > 21)
- row_limit = 20
- if(columns > 21)
- column_limit = 20
- if(mine_limit > (rows*columns) * 0.25)
- mine_limit_v2 = 24
- message_admins("[key_name_admin(user)] failed an emagged Minesweeper arcade and has unleashed an explosion armageddon of size [row_limit],[column_limit] around [ADMIN_LOOKUPFLW(user.loc)]!")
- if(mine_limit_v2 < 10)
- explosion(loc, 2, 5, 10, 15) //Thought you could survive by putting as few mines as possible, huh??
- else
- explosion(loc, 1, 3, rand(1,5), rand(1,10))
- var/list/targets = list()
- var/cur_y = y - round(row_limit * 0.5, 1)
- var/starting_row = 1
- if(cur_y < 1)
- starting_row -= cur_y - 1
- cur_y = 1
- var/start_x = x - round(column_limit * 0.5, 1)
- var/starting_column = 1
- if(start_x < 1)
- starting_column -= start_x - 1
- start_x = 1
- for(var/row in starting_row to length(table)) //translate the mines locations into actual turf coordinates.
- if(!locate(cur_y, start_x, z))
- break
- var/cur_x = start_x
- for(var/column in starting_column to length(table[row]))
- var/coord_value = table[row][column]
- if(coord_value == 10 || coord_value == 0) //there is a mine in here.
- var/turf/T = locate(cur_y, cur_x, z)
- if(!T)
- break
- targets += T
- cur_x++
- cur_y++
- var/num_explosions = 0
- for(var/T in shuffle(targets)) //Create a shitton of explosions in irl turfs if we lose, it will probably kill us
- addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, rand(1,2),rand(1,5),rand(3,10), FALSE), 15 * ++num_explosions)
- if(num_explosions == mine_limit_v2)
- return
-
-#undef MINESWEEPERIMG
-#undef MINESWEEPER_GAME_MAIN_MENU
-#undef MINESWEEPER_GAME_PLAYING
-#undef MINESWEEPER_GAME_LOST
-#undef MINESWEEPER_GAME_WON
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index afab49ac76..742a1fe3b0 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -259,11 +259,6 @@
build_path = /obj/machinery/computer/arcade/orion_trail
-/obj/item/circuitboard/computer/arcade/minesweeper
- name = "Minesweeper (Computer Board)"
- icon_state = "generic"
- build_path = /obj/machinery/computer/arcade/minesweeper
-
/obj/item/circuitboard/computer/holodeck// Not going to let people get this, but it's just here for future
name = "Holodeck Control (Computer Board)"
icon_state = "generic"
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 1fa1654c62..0647ec5bc0 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -1295,6 +1295,15 @@
/obj/item/stock_parts/manipulator = 1)
needs_anchored = FALSE
+/obj/item/circuitboard/machine/autoloom
+ name = "Autoloom (Machine Board)"
+ icon_state = "service"
+ build_path = /obj/machinery/autoloom
+ req_components = list(
+ /obj/item/stock_parts/matter_bin = 1,
+ /obj/item/stock_parts/manipulator = 1)
+ needs_anchored = FALSE
+
/obj/item/circuitboard/machine/seed_extractor
name = "Seed Extractor (Machine Board)"
icon_state = "service"
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index d54911528d..3a15e87bdd 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -87,7 +87,7 @@
pai.master_dna = M.dna.unique_enzymes
to_chat(pai, "You have been bound to a new master.")
if(href_list["wipe"])
- var/confirm = input("Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe") in list("Yes", "No")
+ var/confirm = tgui_input_list(usr, "Are you CERTAIN you wish to delete the current personality? This action cannot be undone.", "Personality Wipe", list("Yes", "No"))
if(confirm == "Yes")
if(pai)
to_chat(pai, "You feel yourself slipping away from reality.")
diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm
index cd65149f5d..5483d3dc38 100644
--- a/code/game/objects/items/paint.dm
+++ b/code/game/objects/items/paint.dm
@@ -56,7 +56,7 @@
icon_state = "paint_neutral"
/obj/item/paint/anycolor/attack_self(mob/user)
- var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "pink", "blue", "cyan", "green", "lime", "yellow", "orange", "violet", "purple", "black", "gray", "white")
+ var/t1 = tgui_input_list(user, "Please select a color:", "Locking Computer", list( "red", "pink", "blue", "cyan", "green", "lime", "yellow", "orange", "violet", "purple", "black", "gray", "white"))
if ((user.get_active_held_item() != src || user.stat || user.restrained()))
return
switch(t1)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 504bff9e29..968f6fb354 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -761,7 +761,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
GLOBAL_LIST_INIT(bone_recipes, list(
new /datum/stack_recipe("Bone Dagger", /obj/item/kitchen/knife/combat/bone, 2, time = 20), \
new /datum/stack_recipe("Skull Helmet", /obj/item/clothing/head/helmet/skull, 4, time = 30), \
- new /datum/stack_recipe("Bone Armor", /obj/item/clothing/suit/armor/bone, 6, time = 30)))
+ new /datum/stack_recipe("Bone Armor", /obj/item/clothing/suit/armor/bone, 6, time = 30),\
+ new /datum/stack_recipe("Processable Bone", /obj/item/ingot/bone, 2, time = 20)))
/obj/item/stack/sheet/bone
name = "bones"
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index a1716cd8cc..e3825b1ee6 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -800,6 +800,13 @@
/datum/outfit/ghostcafe/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
..()
+ if (isplasmaman(H))
+ head = /obj/item/clothing/head/helmet/space/plasmaman
+ uniform = /obj/item/clothing/under/plasmaman
+ l_hand= /obj/item/tank/internals/plasmaman/belt/full
+ mask = /obj/item/clothing/mask/breath
+ return
+
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants))
uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
@@ -809,6 +816,10 @@
else
uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
+/datum/outfit/ghostcafe/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+ H.internal = H.get_item_for_held_index(1)
+ H.update_internals_hud_icon(1)
+
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit"
desc = "Look just the way you did in life - or better!"
diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 0af024985e..2d680fe212 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -273,24 +273,6 @@
"frenching" = 'icons/UI_Icons/Achievements/Misc/frenchingthebubble.png'
)
-/datum/asset/spritesheet/simple/minesweeper
- name = "minesweeper"
- assets = list(
- "1" = 'icons/UI_Icons/minesweeper_tiles/one.png',
- "2" = 'icons/UI_Icons/minesweeper_tiles/two.png',
- "3" = 'icons/UI_Icons/minesweeper_tiles/three.png',
- "4" = 'icons/UI_Icons/minesweeper_tiles/four.png',
- "5" = 'icons/UI_Icons/minesweeper_tiles/five.png',
- "6" = 'icons/UI_Icons/minesweeper_tiles/six.png',
- "7" = 'icons/UI_Icons/minesweeper_tiles/seven.png',
- "8" = 'icons/UI_Icons/minesweeper_tiles/eight.png',
- "empty" = 'icons/UI_Icons/minesweeper_tiles/empty.png',
- "flag" = 'icons/UI_Icons/minesweeper_tiles/flag.png',
- "hidden" = 'icons/UI_Icons/minesweeper_tiles/hidden.png',
- "mine" = 'icons/UI_Icons/minesweeper_tiles/mine.png',
- "minehit" = 'icons/UI_Icons/minesweeper_tiles/minehit.png'
- )
-
/datum/asset/spritesheet/simple/pills
name = "pills"
assets = list(
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 51f5fc4769..03158b22d1 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -403,6 +403,9 @@
if("incheck")
send_signal(device_id, list("checks" = text2num(params["val"])^2), usr)
. = TRUE
+ if("direction")
+ send_signal(device_id, list("direction" = text2num(params["val"])), usr)
+ . = TRUE
if("set_external_pressure", "set_internal_pressure")
var/target = params["value"]
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
index c0dfc5633e..4ad3bbf575 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -12,6 +12,8 @@
var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null
var/update_cycle
+ var/old_temperature = 0
+ var/other_old_temperature = 0
pipe_state = "heunary"
@@ -59,9 +61,6 @@
var/other_air_heat_capacity = partner_air_contents.heat_capacity()
var/combined_heat_capacity = other_air_heat_capacity + air_heat_capacity
- var/old_temperature = air_contents.return_temperature()
- var/other_old_temperature = partner_air_contents.return_temperature()
-
if(combined_heat_capacity > 0)
var/combined_energy = partner_air_contents.return_temperature()*other_air_heat_capacity + air_heat_capacity*air_contents.return_temperature()
@@ -71,6 +70,8 @@
if(abs(old_temperature-air_contents.return_temperature()) > 1)
update_parents()
+ old_temperature = air_contents.return_temperature()
if(abs(other_old_temperature-partner_air_contents.return_temperature()) > 1)
partner.update_parents()
+ other_old_temperature = partner_air_contents.return_temperature()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 1a53a5299f..a3644ed084 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -144,7 +144,7 @@
"device" = "VP",
"timestamp" = world.time,
"power" = on,
- "direction" = pump_direction ? "release" : "siphon",
+ "direction" = pump_direction,
"checks" = pressure_checks,
"internal" = internal_pressure_bound,
"external" = external_pressure_bound,
diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm
index 91663dbe0f..990e32df67 100644
--- a/code/modules/cargo/packs/misc.dm
+++ b/code/modules/cargo/packs/misc.dm
@@ -171,11 +171,11 @@
desc = "Start up your own grand casino with this crate filled with slot machine and arcade boards!"
cost = 3000
contains = list(/obj/item/circuitboard/computer/arcade/battle,
+ /obj/item/circuitboard/computer/arcade/battle,
/obj/item/circuitboard/computer/arcade/battle,
/obj/item/circuitboard/computer/arcade/orion_trail,
/obj/item/circuitboard/computer/arcade/orion_trail,
- /obj/item/circuitboard/computer/arcade/minesweeper,
- /obj/item/circuitboard/computer/arcade/minesweeper,
+ /obj/item/circuitboard/computer/arcade/orion_trail,
/obj/item/circuitboard/computer/slot_machine,
/obj/item/circuitboard/computer/slot_machine,
/obj/item/circuitboard/computer/slot_machine,
diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm
index 4ad307731e..6ef693a886 100644
--- a/code/modules/events/operative.dm
+++ b/code/modules/events/operative.dm
@@ -3,7 +3,6 @@
typepath = /datum/round_event/ghost_role/operative
weight = 0 //Admin only
max_occurrences = 1
- dynamic_should_hijack = TRUE
/datum/round_event/ghost_role/operative
minimum_required = 1
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index d8496818eb..cc02d7b7d0 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -24,7 +24,7 @@
var/pirate_type = PIRATES_ROGUES //pick(PIRATES_ROGUES, PIRATES_SILVERSCALES, PIRATES_DUTCHMAN)
var/datum/comm_message/threat_msg = new
var/payoff = 0
- var/payoff_min = 1000
+ var/payoff_min = 10000 //documented this time
var/ship_template
var/ship_name = "Space Privateers Association"
var/initial_send_time = world.time
diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm
index ec65d75835..ef2ad0fc27 100644
--- a/code/modules/jobs/job_types/prisoner.dm
+++ b/code/modules/jobs/job_types/prisoner.dm
@@ -5,7 +5,7 @@
department_flag = CIVILIAN
faction = "Station"
total_positions = 0
- spawn_positions = 4
+ spawn_positions = 0
supervisors = "the security team"
outfit = /datum/outfit/job/prisoner
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index 45f1b1d94e..2149967049 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -235,6 +235,9 @@
icon_state = "crusher-bone"
item_state = "crusher0-bone"
+/obj/item/kinetic_crusher/glaive/bone/update_icon_state()
+ item_state = "crusher[wielded]-bone"
+
//destablizing force
/obj/item/projectile/destabilizer
name = "destabilizing force"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index cca75f2098..a68f20aa18 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -116,19 +116,19 @@
to_chat(src, "[L] is restraining [P], you cannot push past.")
return 1
- //CIT CHANGES START HERE - makes it so resting stops you from moving through standing folks without a short delay
- if(!CHECK_MOBILITY(src, MOBILITY_STAND) && CHECK_MOBILITY(L, MOBILITY_STAND))
+ //CIT CHANGES START HERE - makes it so resting stops you from moving through standing folks or over prone bodies without a short delay
+ if(!CHECK_MOBILITY(src, MOBILITY_STAND))
var/origtargetloc = L.loc
if(!pulledby)
if(combat_flags & COMBAT_FLAG_ATTEMPTING_CRAWL)
return TRUE
if(IS_STAMCRIT(src))
- to_chat(src, "You're too exhausted to crawl under [L].")
+ to_chat(src, "You're too exhausted to crawl [(CHECK_MOBILITY(L, MOBILITY_STAND)) ? "under": "over"] [L].")
return TRUE
ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_ATTEMPTING_CRAWL)
- visible_message("[src] is attempting to crawl under [L].",
- "You are now attempting to crawl under [L].",
- target = L, target_message = "[src] is attempting to crawl under you.")
+ visible_message("[src] is attempting to crawl [(CHECK_MOBILITY(L, MOBILITY_STAND)) ? "under" : "over"] [L].",
+ "You are now attempting to crawl [(CHECK_MOBILITY(L, MOBILITY_STAND)) ? "under": "over"] [L].",
+ target = L, target_message = "[src] is attempting to crawl [(CHECK_MOBILITY(L, MOBILITY_STAND)) ? "under" : "over"] you.")
if(!do_after(src, CRAWLUNDER_DELAY, target = src) || CHECK_MOBILITY(src, MOBILITY_STAND))
DISABLE_BITFIELD(combat_flags, COMBAT_FLAG_ATTEMPTING_CRAWL)
return TRUE
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 07b40b3ab1..075a135f76 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -37,6 +37,8 @@
if(mover in buckled_mobs)
return TRUE
var/mob/living/L = mover //typecast first, check isliving and only check this if living using short circuit
+ if(lying && L.lying) //if we're both lying down and aren't already being thrown/shipped around, don't pass
+ return FALSE
return (!density || (isliving(mover)? L.can_move_under_living(src) : !mover.density))
/mob/living/toggle_move_intent()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index fc51915b73..5d7bb9a8b6 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -358,8 +358,16 @@
var/obj/singularity/energy_ball/tesla = source
if(istype(tesla))
if(istype(closest_atom,/obj/machinery/power/grounding_rod) && tesla.energy>13 && !tesla.contained)
- qdel(closest_atom) // each rod deletes two miniballs,
- tesla.energy = round(tesla.energy/1.5625) // if there are no miniballs the rod stays and continues to pull the ball in
+
+ // getting the grounding rod's capacitor rating for quick maths
+ var/obj/machinery/power/grounding_rod/rod = closest_atom
+ // assuming the rod is fully constructed the second part will always be a capacitor
+ var/obj/item/stock_parts/capacitor/capacitor = rod.component_parts[2]
+
+ tesla.energy = round(tesla.energy/(1 + 0.28125 * capacitor.rating))
+ qdel(closest_atom) // each rod removes tesla energy depending on the power of the capacitor,
+ // if there are no miniballs the rod stays and continues to pull the ball in
+
if(prob(20))//I know I know
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
index 99caa5b480..8ea883edf1 100644
--- a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
+++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm
@@ -21,14 +21,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ALL
-/datum/design/board/minesweeper
- name = "Computer Design (Minesweeper Arcade Machine)"
- desc = "Allows for the construction of circuit boards used to build a new Minesweeper machine."
- id = "arcade_minesweeper"
- build_path = /obj/item/circuitboard/computer/arcade/minesweeper
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_ALL
-
/datum/design/board/slot_machine
name = "Computer Design (Slot Machine)"
desc = "Allows for the construction of circuit boards used to build a new slot machine."
diff --git a/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm b/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
index 81b16d1118..570c99e6ae 100644
--- a/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
+++ b/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
@@ -10,6 +10,14 @@
category = list ("Misc. Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ALL
+/datum/design/board/autoloom
+ name = "Machine Design (Autoloom Board)"
+ desc = "The circuit board for an autoloom."
+ id = "autoloom"
+ build_path = /obj/item/circuitboard/machine/autoloom
+ category = list ("Misc. Machinery")
+ departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
/datum/design/board/holopad
name = "Machine Design (AI Holopad Board)"
desc = "The circuit board for a holopad."
diff --git a/code/modules/research/techweb/nodes/computer_hud_nodes.dm b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
index 2db03861e9..0f2cf2e4bd 100644
--- a/code/modules/research/techweb/nodes/computer_hud_nodes.dm
+++ b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
@@ -56,5 +56,5 @@
display_name = "Games and Toys"
description = "For the slackers on the station."
prereq_ids = list("comptech")
- design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe")
+ design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
diff --git a/code/modules/research/techweb/nodes/tools_nodes.dm b/code/modules/research/techweb/nodes/tools_nodes.dm
index 180cdb5778..86a48ab8de 100644
--- a/code/modules/research/techweb/nodes/tools_nodes.dm
+++ b/code/modules/research/techweb/nodes/tools_nodes.dm
@@ -37,7 +37,7 @@
display_name = "Botanical Engineering"
description = "Botanical tools."
prereq_ids = list("adv_engi", "biotech")
- design_ids = list("diskplantgene", "portaseeder", "plantgenes", "flora_gun", "hydro_tray", "biogenerator", "seed_extractor")
+ design_ids = list("diskplantgene", "portaseeder", "plantgenes", "flora_gun", "hydro_tray", "biogenerator", "seed_extractor", "autoloom")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2750)
/datum/techweb_node/exp_tools
diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm
index 476565c8bb..c89f338f29 100644
--- a/code/modules/smithing/anvil.dm
+++ b/code/modules/smithing/anvil.dm
@@ -286,6 +286,13 @@
anvilquality = 0
itemqualitymax = 6
+/obj/structure/anvil/obtainable/bone
+ name = "bone anvil"
+ desc = "An anvil. It's made of goliath bones and hide and held together by watcher sinews."
+ icon_state = "bonevil"
+ anvilquality = 0
+ itemqualitymax = 6
+
/obj/structure/anvil/obtainable/ratvar
name = "brass anvil"
desc = "A big block of what appears to be brass. Useable as an anvil, if whatever's holding the brass together lets you."
diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm
index 71e35ba989..3453cafda3 100644
--- a/code/modules/smithing/smithed_items.dm
+++ b/code/modules/smithing/smithed_items.dm
@@ -49,6 +49,9 @@
/obj/item/ingot/iron
custom_materials = list(/datum/material/iron=12000)
+/obj/item/ingot/bone
+ custom_materials = list(/datum/material/bone=4000)
+
/obj/item/ingot/diamond
custom_materials = list(/datum/material/diamond=12000)
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 5c914e3d4d..897c7610a1 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -530,8 +530,8 @@
gas_max[GAS_N2] = PP(breath, GAS_N2) + 5
var/datum/breathing_class/class = GLOB.gas_data.breathing_classes[breathing_class]
var/o2_pp = class.get_effective_pp(breath)
- safe_breath_min = 0.3 * o2_pp
- safe_breath_max = 1.3 * o2_pp
+ safe_breath_min = min(3, 0.3 * o2_pp)
+ safe_breath_max = max(18, 1.3 * o2_pp + 1)
..()
#undef SAFE_THRESHOLD_RATIO
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index c4da65a902..f65df26488 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -90,7 +90,7 @@
playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75)
log_combat(src, hittarget_living, "sucked up")
return
- if(!istype(bumped, /turf/closed))
+ if(!istype(bumped, /turf/closed) && !istype(bumped, /obj/machinery/door/airlock/external))
return
visible_message(span_warning("[src] rams into [bumped] and crashes!"))
playsound(src, pick('sound/vehicles/clowncar_crash1.ogg', 'sound/vehicles/clowncar_crash2.ogg'), 75)
@@ -237,6 +237,11 @@
for(var/mob/busdriver as anything in return_drivers())
busdriver.client.give_award(/datum/award/achievement/misc/the_best_driver, busdriver)
+/obj/vehicle/sealed/car/clowncar/driver_move(mob/user, direction) //Prevent it from moving onto space
+ if(isspaceturf(get_step(src, direction)))
+ return FALSE
+ return ..()
+
/obj/vehicle/sealed/car/clowncar/twitch_plays
key_type = null
explode_on_death = FALSE
diff --git a/html/changelog.html b/html/changelog.html
index a9206c180f..2b6407735e 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,42 @@
-->
+
26 October 2021
+
WanderingFox95 updated:
+
+
bone anvils and bone ingots
+
bone anvil sprites
+
+
+
25 October 2021
+
Putnam3145 updated:
+
+
Vent pumps can now be set to siphoning via the air alarm UI
+
+
keronshb updated:
+
+
10k pirate spending money
+
+
+
22 October 2021
+
Putnam3145 updated:
+
+
Ashwalker lungs more aggressively attempt to be safe on lavaland
+
+
WanderingFox95 updated:
+
+
fixed the wielded sprites not showing up properly.
+
fixed a runtime in the bark box vendor
+
added a missing tennis ball sprite
+
+
+
20 October 2021
+
Putnam3145 updated:
+
+
Removed a panic from auxmos
+
Properly implemented hysteresis on heat exchanger processing
+
+
16 October 2021
Ryll/Shaps updated:
@@ -460,66 +496,6 @@
Adds catwalk floors
-
-
24 August 2021
-
BlueWildrose updated:
-
-
MK ultra explosions (failures at making MKultra) are gone, and replaced with a gas that just causes a bunch of status effects to you.
-
-
-
23 August 2021
-
zeroisthebiggay updated:
-
-
i hate the grammarchrist
-
-
-
22 August 2021
-
zeroisthebiggay updated:
-
-
trillby can't spell pair
-
-
-
20 August 2021
-
EmeraldSundisk updated:
-
-
Adds a law office/courtroom to OmegaStation
-
Adds a gateway to OmegaStation
-
Adds a pool/maintenance bar to OmegaStation
-
Removes the original maintenance garden in OmegaStation tweak: Relocates the bathrooms to the starboard hall tweak: Modifies port quarter maintenance to include some affected items
-
-
Putnam3145 updated:
-
-
Beach now has showers
-
-
TripleShades updated:
-
-
At least four or five space heaters spread across Pubby Station Maints
-
Missing decal in Pubby Station engineering
-
Moved an atmos alarm in the SM emitter chamber so it wont be destroyed
-
-
WanderingFox95 updated:
-
-
Empty bottles and pitchers are available to the bartender now.
-
They even come with 10 different fillstates!
-
Better Shark Tails, dodododododo~
-
The old ones are now listed as carp tails.
-
-
-
18 August 2021
-
timothyteakettle updated:
-
-
lets you select 4 prosthetic limbs instead of only 2
-
-
-
16 August 2021
-
BlueWildrose updated:
-
-
Incapacitated mobs are blacklisted from being human-level intelligence sentience event candidates. This is particularly important due to slimes in BZ stasis on the station.
-
-
bunny232 updated:
-
-
Polyvitiligo actually changes your color now
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 71db5b168f..d4cc657b3d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -30147,3 +30147,23 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
keronshb:
- rscadd: Adds the fat dart cigarette and to vendors
- imageadd: Adds the sprites for the fat dart
+2021-10-20:
+ Putnam3145:
+ - bugfix: Removed a panic from auxmos
+ - bugfix: Properly implemented hysteresis on heat exchanger processing
+2021-10-22:
+ Putnam3145:
+ - bugfix: Ashwalker lungs more aggressively attempt to be safe on lavaland
+ WanderingFox95:
+ - bugfix: fixed the wielded sprites not showing up properly.
+ - bugfix: fixed a runtime in the bark box vendor
+ - imageadd: added a missing tennis ball sprite
+2021-10-25:
+ Putnam3145:
+ - rscadd: Vent pumps can now be set to siphoning via the air alarm UI
+ keronshb:
+ - balance: 10k pirate spending money
+2021-10-26:
+ WanderingFox95:
+ - rscadd: bone anvils and bone ingots
+ - imageadd: bone anvil sprites
diff --git a/html/changelogs/AutoChangeLog-pr-15232.yml b/html/changelogs/AutoChangeLog-pr-15232.yml
new file mode 100644
index 0000000000..42ecc16aed
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15232.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscdel: "Removed minesweeper"
diff --git a/html/changelogs/AutoChangeLog-pr-15277.yml b/html/changelogs/AutoChangeLog-pr-15277.yml
new file mode 100644
index 0000000000..dfba6d12de
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15277.yml
@@ -0,0 +1,4 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "NanoTrasen is rolling out a prototype Autoloom, hidden behind Botanical Engineering. It only processes cotton and logs. Despite its visual similarity to the recycler, it is entirely tamperproof."
diff --git a/html/changelogs/AutoChangeLog-pr-15303.yml b/html/changelogs/AutoChangeLog-pr-15303.yml
new file mode 100644
index 0000000000..ff0a4883f6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15303.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "plasmamen now spawn in their proper outfit in the ghostcafe"
diff --git a/icons/obj/barkbox_fluff.dmi b/icons/obj/barkbox_fluff.dmi
index e420e864e7..f209ad7c31 100644
Binary files a/icons/obj/barkbox_fluff.dmi and b/icons/obj/barkbox_fluff.dmi differ
diff --git a/icons/obj/smith.dmi b/icons/obj/smith.dmi
index 19e12dec86..87be22c5a8 100644
Binary files a/icons/obj/smith.dmi and b/icons/obj/smith.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index 3136cf34b2..026612b144 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index c296347073..7a8a7a173e 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -854,6 +854,7 @@
#include "code\game\machinery\announcement_system.dm"
#include "code\game\machinery\aug_manipulator.dm"
#include "code\game\machinery\autolathe.dm"
+#include "code\game\machinery\autoloom.dm"
#include "code\game\machinery\bank_machine.dm"
#include "code\game\machinery\Beacon.dm"
#include "code\game\machinery\bloodbankgen.dm"
@@ -936,7 +937,6 @@
#include "code\game\machinery\computer\telecrystalconsoles.dm"
#include "code\game\machinery\computer\teleporter.dm"
#include "code\game\machinery\computer\arcade\battle.dm"
-#include "code\game\machinery\computer\arcade\minesweeper.dm"
#include "code\game\machinery\computer\arcade\misc_arcade.dm"
#include "code\game\machinery\computer\arcade\orion_trail.dm"
#include "code\game\machinery\computer\prisoner\_prisoner.dm"
diff --git a/tgui/packages/tgui/interfaces/common/AtmosControls.js b/tgui/packages/tgui/interfaces/common/AtmosControls.js
index 76348a956f..fcca00188a 100644
--- a/tgui/packages/tgui/interfaces/common/AtmosControls.js
+++ b/tgui/packages/tgui/interfaces/common/AtmosControls.js
@@ -37,7 +37,7 @@ export const Vent = (props, context) => {