From b6fd7f18e2f9221f776df56545e48404aa47b947 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 9 May 2020 19:22:42 -0400 Subject: [PATCH 01/26] Update large_objects.dm --- code/modules/cargo/exports/large_objects.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index b7bdcb1f59..d71e5b2a48 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -171,13 +171,13 @@ var/worth = 10 var/gases = C.air_contents.gases - worth += gases[/datum/gas/bz]*4 - worth += gases[/datum/gas/stimulum]*25 - worth += gases[/datum/gas/hypernoblium]*1000 - worth += gases[/datum/gas/miasma]*4 - worth += gases[/datum/gas/tritium]*7 - worth += gases[/datum/gas/pluoxium]*6 - worth += gases[/datum/gas/nitryl]*30 + worth += gases[/datum/gas/bz]*2 + worth += gases[/datum/gas/stimulum]*20 + worth += gases[/datum/gas/hypernoblium]*100 + worth += gases[/datum/gas/miasma]*1 + worth += gases[/datum/gas/tritium]*4 + worth += gases[/datum/gas/pluoxium]*3 + worth += gases[/datum/gas/nitryl]*25 return worth From d1a80ca2d73e7e1cd1636406e0a0b0eba1cc63c3 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 3 Jun 2020 20:29:17 -0400 Subject: [PATCH 02/26] Ghommie requested change --- code/modules/cargo/exports/large_objects.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index d71e5b2a48..b6df2354a8 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -177,7 +177,7 @@ worth += gases[/datum/gas/miasma]*1 worth += gases[/datum/gas/tritium]*4 worth += gases[/datum/gas/pluoxium]*3 - worth += gases[/datum/gas/nitryl]*25 + worth += gases[/datum/gas/nitryl]*30 return worth From ee2a2a30e4f19ea54c60066652ce20c07477bea5 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 4 Jun 2020 17:18:44 +0100 Subject: [PATCH 03/26] easy fix --- code/__HELPERS/areas.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 8e4c363227..e2249dbb63 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -170,6 +170,7 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/eng newA.setup(str) newA.set_dynamic_lighting() newA.has_gravity = oldA.has_gravity + newA.noteleport = oldA.noteleport else newA = area_choice From 2002a273de4209ca631610e5e262744a3dc7bb95 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:04:16 -0700 Subject: [PATCH 04/26] Makes empty internal tanks printable --- code/game/objects/items/tanks/tank_types.dm | 5 +- code/modules/research/designs/misc_designs.dm | 54 +++++++++++++++++++ .../techweb/nodes/engineering_nodes.dm | 8 +++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 8f5303da8e..b4c8d8adf0 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -93,11 +93,13 @@ F.update_icon() else return ..() +//Makes empty oxygen tanks spawn without gas +/obj/item/tank/internals/plasma/empty/populate_gas() + return /obj/item/tank/internals/plasma/full/populate_gas() air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - /* * Plasmaman Plasma Tank */ @@ -130,6 +132,7 @@ air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return +//makes empty plasma tanks spawn without gas. /obj/item/tank/internals/plasmaman/belt/empty/populate_gas() return diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index e9af465c8a..9b44264b07 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -707,3 +707,57 @@ build_path = /obj/item/clothing/gloves/tackler/rocket category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +///////////////////////////////////////// +/////////////Internal Tanks////////////// +///////////////////////////////////////// + +/datum/design/oxygen_tank + name = "Oxygen Tank" + desc = "An empty oxygen tank." + id = "oxygen_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_tank + name = "Plasma Tank" + desc = "An empty plasma tank." + id = "plasma_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/plasma/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen + name = "Emergency Oxygen Tank" + desc = "A small emergency oxygen tank." + id = "emergency_oxygen" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_belt_tank + name = "Plasmaman Belt Tank" + desc = "A small tank of plasma for plasmamen." + id = "plasmaman_tank_belt" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/plasmaman/belt/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen_engi + name = "Engineering Emergency Oxygen Tank" + desc = "An emergency oxygen tank for engineers." + id = "emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING \ No newline at end of file diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 2ab5458028..2fc6d6097e 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -42,6 +42,14 @@ design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor", "circulator", "teg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) +/datum/techweb_node/int_tank + id = "int_tank" + display_name = "Internal Tanks" + description = "How to compress air into smaller containers." + prereq_ids = list("engineering") + design_ids = list("oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + /* /datum/techweb_node/basic_meteor_defense id = "basic_meteor_defense" From e80ec920e08b71d7cd4d3b6858777acba4047ebe Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:42:10 -0700 Subject: [PATCH 05/26] Moved the tanks to industrial tech node. --- .../research/techweb/nodes/engineering_nodes.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 2fc6d6097e..eac8c2faf2 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -7,7 +7,8 @@ prereq_ids = list("base") design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "atmosalerts", "atmos_control", "recycler", "autolathe", "autolathe_secure", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo") + "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo","oxygen_tank", + "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) /datum/techweb_node/adv_engi @@ -42,14 +43,6 @@ design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor", "circulator", "teg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) -/datum/techweb_node/int_tank - id = "int_tank" - display_name = "Internal Tanks" - description = "How to compress air into smaller containers." - prereq_ids = list("engineering") - design_ids = list("oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - /* /datum/techweb_node/basic_meteor_defense id = "basic_meteor_defense" From a2c4b741ad4c738f2ad58e7fa580de42c4d0a03a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 4 Jun 2020 21:46:38 -0400 Subject: [PATCH 06/26] ahaha what if they didnt heal? --- code/game/objects/items/weaponry.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 1bb4579176..f2b3d1ec9b 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -675,7 +675,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 to_chat(user, "You easily land a critical blow on the [target].") if(istype(target, /mob/living/)) var/mob/living/bug = target - bug.adjustBruteLoss(-35) //What kinda mad man would go into melee with a spider?! + bug.adjustBruteLoss(35) //What kinda mad man would go into melee with a spider?! else qdel(target) From 994ab8ac16ea36d3918eca142825749b12d19ec2 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Sat, 6 Jun 2020 16:00:26 +0100 Subject: [PATCH 07/26] fixes spacevines --- code/modules/events/spacevine.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 69bfa6e569..89b70f8951 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -383,6 +383,7 @@ /datum/spacevine_controller/New(turf/location, list/muts, potency, production, datum/round_event/event = null) vines = list() growth_queue = list() + spawn_spacevine_piece(location, null, muts) START_PROCESSING(SSobj, src) vine_mutations_list = list() init_subtypes(/datum/spacevine_mutation/, vine_mutations_list) From fe39ffe033a3131b04bd8789c115f166dc7e3c40 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 6 Jun 2020 17:07:50 +0200 Subject: [PATCH 08/26] quick oneline thing --- code/modules/antagonists/changeling/changeling.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 106ae16031..35639bfd97 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -91,6 +91,7 @@ B.organ_flags |= ORGAN_VITAL B.decoy_override = FALSE remove_changeling_powers() + owner.special_role = null . = ..() /datum/antagonist/changeling/proc/remove_clownmut() From 0cfbee98098536fd257850cd76b69fb78dc433fb Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Sat, 6 Jun 2020 18:08:30 +0200 Subject: [PATCH 09/26] modifies keycard authentification devices They now actually require an ID to authentificate instead of just 'access' to it. Additionally, one can no longer initiate and confirm actions with the same ID. --- .../security_levels/keycard_authentication.dm | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 04f2de9bec..adf53ff0da 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -20,6 +20,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) var/event = "" var/obj/machinery/keycard_auth/event_source var/mob/triggerer = null + var/obj/item/card/id/first_id = null var/waiting = 0 /obj/machinery/keycard_auth/Initialize() @@ -56,32 +57,37 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) return ..() /obj/machinery/keycard_auth/ui_act(action, params) - if(..() || waiting || !allowed(usr)) + if(..() || waiting) + return + var/obj/item/card/id/ID = usr.get_idcard(TRUE) + if(!ID || !istype(ID)) + return + if(!check_access(ID)) return switch(action) if("red_alert") if(!event_source) - sendEvent(KEYCARD_RED_ALERT) + sendEvent(KEYCARD_RED_ALERT, ID) . = TRUE if("emergency_maint") if(!event_source) - sendEvent(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS) + sendEvent(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS, ID) . = TRUE if("auth_swipe") - if(event_source) + if(event_source && ID != first_id && first_id) event_source.trigger_event(usr) event_source = null . = TRUE if("bsa_unlock") if(!event_source) - sendEvent(KEYCARD_BSA_UNLOCK) + sendEvent(KEYCARD_BSA_UNLOCK, ID) . = TRUE -/obj/machinery/keycard_auth/proc/sendEvent(event_type) +/obj/machinery/keycard_auth/proc/sendEvent(event_type, trigger_id) triggerer = usr event = event_type waiting = 1 - GLOB.keycard_events.fireEvent("triggerEvent", src) + GLOB.keycard_events.fireEvent("triggerEvent", src, trigger_id) addtimer(CALLBACK(src, .proc/eventSent), 20) /obj/machinery/keycard_auth/proc/eventSent() @@ -89,14 +95,16 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) event = "" waiting = 0 -/obj/machinery/keycard_auth/proc/triggerEvent(source) +/obj/machinery/keycard_auth/proc/triggerEvent(source, trigger_id) icon_state = "auth_on" + first_id = trigger_id event_source = source addtimer(CALLBACK(src, .proc/eventTriggered), 20) /obj/machinery/keycard_auth/proc/eventTriggered() icon_state = "auth_off" event_source = null + first_id = null /obj/machinery/keycard_auth/proc/trigger_event(confirmer) log_game("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]") From fe6cf2dd44dfcce8eedfb0ca63abef94753248ac Mon Sep 17 00:00:00 2001 From: Linzolle Date: Sat, 6 Jun 2020 14:22:23 -0500 Subject: [PATCH 10/26] ramsay broke every shotgun --- code/modules/projectiles/guns/ballistic.dm | 2 +- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 +- code/modules/projectiles/guns/ballistic/toy.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e45483569e..4aeefde6d4 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -25,7 +25,7 @@ else icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]" -/obj/item/gun/ballistic/process_chamber(empty_chamber = 1) +/obj/item/gun/ballistic/process_chamber(mob/living/user, empty_chamber = 1) var/obj/item/ammo_casing/AC = chambered //Find chambered round if(istype(AC)) //there's a chambered round if(casing_ejector) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 17f5cc4262..a182ce2e35 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -23,7 +23,7 @@ A.update_icon() update_icon() -/obj/item/gun/ballistic/shotgun/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) return ..() //changed argument value /obj/item/gun/ballistic/shotgun/chamber_round() diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index 4060a02c0f..5cdd773894 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -57,7 +57,7 @@ casing_ejector = FALSE can_suppress = FALSE -/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/toy/process_chamber(mob/living/user, empty_chamber = 0) ..() if(chambered && !chambered.BB) qdel(chambered) From bc77b37892d1ab438d6e5409a659f8f9813d3450 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 7 Jun 2020 09:23:14 -0700 Subject: [PATCH 11/26] Update README.md (#12478) --- modular_citadel/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/README.md b/modular_citadel/README.md index dfae177607..c5443bdbb5 100644 --- a/modular_citadel/README.md +++ b/modular_citadel/README.md @@ -1,3 +1,4 @@ Hooray modularity! + Things that modify core files without directly touching said core files go here. This is similar to how Hippie handles things. This stops dreammaker from throwing errors and warnings if you try to compile these files while they're inside code/citadel/. From a9eb0ba9e58a989e09fc5ec145d3039bab2c1edf Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 11:23:17 -0500 Subject: [PATCH 12/26] Automatic changelog generation for PR #12478 [ci skip] --- html/changelogs/AutoChangeLog-pr-12478.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12478.yml diff --git a/html/changelogs/AutoChangeLog-pr-12478.yml b/html/changelogs/AutoChangeLog-pr-12478.yml new file mode 100644 index 0000000000..164a52532f --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12478.yml @@ -0,0 +1,5 @@ +author: "kevinz000" +delete-after: True +changes: + - rscadd: "test" + - rscdel: "test" From 70b4f4a9bf81bd87fee0da311507f05f5378e437 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:32:13 -0500 Subject: [PATCH 13/26] Automatic changelog generation for PR #12464 [ci skip] --- html/changelogs/AutoChangeLog-pr-12464.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12464.yml diff --git a/html/changelogs/AutoChangeLog-pr-12464.yml b/html/changelogs/AutoChangeLog-pr-12464.yml new file mode 100644 index 0000000000..ad13ec1791 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12464.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - balance: "Keycard auth devices now require two seperate IDs with sufficient access to auth." From 2a54a62ac05abe075f8e168b4d57fcc929cc17e0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:33:54 -0500 Subject: [PATCH 14/26] Automatic changelog generation for PR #12462 [ci skip] --- html/changelogs/AutoChangeLog-pr-12462.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12462.yml diff --git a/html/changelogs/AutoChangeLog-pr-12462.yml b/html/changelogs/AutoChangeLog-pr-12462.yml new file mode 100644 index 0000000000..f97dd0db25 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12462.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "kudzu seeds now actually spawn vines" From c5ad83da5815f2cbc592d3029e8500cf1823939a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:34:35 -0500 Subject: [PATCH 15/26] Automatic changelog generation for PR #12465 [ci skip] --- html/changelogs/AutoChangeLog-pr-12465.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12465.yml diff --git a/html/changelogs/AutoChangeLog-pr-12465.yml b/html/changelogs/AutoChangeLog-pr-12465.yml new file mode 100644 index 0000000000..c3d23907fa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12465.yml @@ -0,0 +1,4 @@ +author: "Linzolle" +delete-after: True +changes: + - bugfix: "shotguns no longer delete chambered shells while firing" From c11690e490c0987c7a2c1811598460f450c2dc29 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:35:49 -0500 Subject: [PATCH 16/26] Automatic changelog generation for PR #12463 [ci skip] --- html/changelogs/AutoChangeLog-pr-12463.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12463.yml diff --git a/html/changelogs/AutoChangeLog-pr-12463.yml b/html/changelogs/AutoChangeLog-pr-12463.yml new file mode 100644 index 0000000000..d16bd3c435 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12463.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Delinging now properly removes their special role" From ec157a25b0895ec21be6157c7d151f591dca1a22 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:37:28 -0500 Subject: [PATCH 17/26] Automatic changelog generation for PR #12444 [ci skip] --- html/changelogs/AutoChangeLog-pr-12444.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12444.yml diff --git a/html/changelogs/AutoChangeLog-pr-12444.yml b/html/changelogs/AutoChangeLog-pr-12444.yml new file mode 100644 index 0000000000..0fd020458d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12444.yml @@ -0,0 +1,4 @@ +author: "shellspeed1" +delete-after: True +changes: + - rscadd: "Internal tanks are now printable at the engineering lathe." From 8532109c27141512b69b181dd000123a34dc904d Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 7 Jun 2020 17:38:05 -0500 Subject: [PATCH 18/26] Automatic changelog generation for PR #12443 [ci skip] --- html/changelogs/AutoChangeLog-pr-12443.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12443.yml diff --git a/html/changelogs/AutoChangeLog-pr-12443.yml b/html/changelogs/AutoChangeLog-pr-12443.yml new file mode 100644 index 0000000000..d96bc82283 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12443.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - bugfix: "newly created areas using blueprints now maintain the previous areas noteleport value" From 909b8f40c58d604c92f592a3410f38294c8d14c7 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 8 Jun 2020 00:07:59 +0000 Subject: [PATCH 19/26] Automatic changelog compile [ci skip] --- html/changelog.html | 24 ++++++++++++++++++++++ html/changelogs/.all_changelog.yml | 16 +++++++++++++++ html/changelogs/AutoChangeLog-pr-12443.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12444.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12462.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12463.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12464.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12465.yml | 4 ---- html/changelogs/AutoChangeLog-pr-12478.yml | 5 ----- 9 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-12443.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12444.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12462.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12463.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12464.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12465.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-12478.yml diff --git a/html/changelog.html b/html/changelog.html index cc419e13fb..c04920ec85 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,30 @@ -->
+

08 June 2020

+

DeltaFire15 updated:

+
    +
  • Delinging now properly removes their special role
    • +
  • Keycard auth devices now require two seperate IDs with sufficient access to auth.
    • +
+

Linzolle updated:

+
    +
  • shotguns no longer delete chambered shells while firing
    • +
+

kevinz000 updated:

+
    +
  • test
    • +
+

shellspeed1 updated:

+
    +
  • Internal tanks are now printable at the engineering lathe.
    • +
+

timothyteakettle updated:

+
    +
  • newly created areas using blueprints now maintain the previous areas noteleport value
    • +
  • kudzu seeds now actually spawn vines
    • +
+

19 April 2020

Anonymous updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d07b7c3a4f..8a96ef2792 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -25832,3 +25832,19 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Adding in some overrides and proper flag checks for martial arts. - bugfix: Stun thresholding stops disarm spams at extremely high stamina loss. - tweak: Ashen Arrows are actually called Ashen Arrows in the crafting menu. +2020-06-08: + DeltaFire15: + - bugfix: Delinging now properly removes their special role + - balance: Keycard auth devices now require two seperate IDs with sufficient access + to auth. + Linzolle: + - bugfix: shotguns no longer delete chambered shells while firing + kevinz000: + - rscadd: test + - rscdel: test + shellspeed1: + - rscadd: Internal tanks are now printable at the engineering lathe. + timothyteakettle: + - bugfix: newly created areas using blueprints now maintain the previous areas noteleport + value + - bugfix: kudzu seeds now actually spawn vines diff --git a/html/changelogs/AutoChangeLog-pr-12443.yml b/html/changelogs/AutoChangeLog-pr-12443.yml deleted file mode 100644 index d96bc82283..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12443.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "newly created areas using blueprints now maintain the previous areas noteleport value" diff --git a/html/changelogs/AutoChangeLog-pr-12444.yml b/html/changelogs/AutoChangeLog-pr-12444.yml deleted file mode 100644 index 0fd020458d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12444.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "shellspeed1" -delete-after: True -changes: - - rscadd: "Internal tanks are now printable at the engineering lathe." diff --git a/html/changelogs/AutoChangeLog-pr-12462.yml b/html/changelogs/AutoChangeLog-pr-12462.yml deleted file mode 100644 index f97dd0db25..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12462.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "kudzu seeds now actually spawn vines" diff --git a/html/changelogs/AutoChangeLog-pr-12463.yml b/html/changelogs/AutoChangeLog-pr-12463.yml deleted file mode 100644 index d16bd3c435..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12463.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Delinging now properly removes their special role" diff --git a/html/changelogs/AutoChangeLog-pr-12464.yml b/html/changelogs/AutoChangeLog-pr-12464.yml deleted file mode 100644 index ad13ec1791..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12464.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - balance: "Keycard auth devices now require two seperate IDs with sufficient access to auth." diff --git a/html/changelogs/AutoChangeLog-pr-12465.yml b/html/changelogs/AutoChangeLog-pr-12465.yml deleted file mode 100644 index c3d23907fa..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12465.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "shotguns no longer delete chambered shells while firing" diff --git a/html/changelogs/AutoChangeLog-pr-12478.yml b/html/changelogs/AutoChangeLog-pr-12478.yml deleted file mode 100644 index 164a52532f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-12478.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "test" - - rscdel: "test" From abaf633ab9fcd6804a45992772a7781a6c768ccd Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Jun 2020 01:09:06 -0400 Subject: [PATCH 20/26] Update large_objects.dm --- code/modules/cargo/exports/large_objects.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index b6df2354a8..85b83f70da 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -171,13 +171,12 @@ var/worth = 10 var/gases = C.air_contents.gases - worth += gases[/datum/gas/bz]*2 - worth += gases[/datum/gas/stimulum]*20 - worth += gases[/datum/gas/hypernoblium]*100 - worth += gases[/datum/gas/miasma]*1 - worth += gases[/datum/gas/tritium]*4 - worth += gases[/datum/gas/pluoxium]*3 - worth += gases[/datum/gas/nitryl]*30 + worth += gases[/datum/gas/bz]*3 + worth += gases[/datum/gas/stimulum]*25 + worth += gases[/datum/gas/hypernoblium]*1000 + worth += gases[/datum/gas/miasma]*2 + worth += gases[/datum/gas/tritium]*7 + worth += gases[/datum/gas/pluoxium]*6 return worth From 6cf4985360b94aaca27488d5576c2dd9929e6906 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 8 Jun 2020 01:09:27 -0400 Subject: [PATCH 21/26] Update large_objects.dm --- code/modules/cargo/exports/large_objects.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm index 85b83f70da..df90deeb48 100644 --- a/code/modules/cargo/exports/large_objects.dm +++ b/code/modules/cargo/exports/large_objects.dm @@ -177,6 +177,7 @@ worth += gases[/datum/gas/miasma]*2 worth += gases[/datum/gas/tritium]*7 worth += gases[/datum/gas/pluoxium]*6 + worth += gases[/datum/gas/nitryl]*30 return worth From a08eec3f73c5a44a193c0050199ee20d01585fb0 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 8 Jun 2020 01:21:10 -0500 Subject: [PATCH 22/26] Automatic changelog generation for PR #12187 [ci skip] --- html/changelogs/AutoChangeLog-pr-12187.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12187.yml diff --git a/html/changelogs/AutoChangeLog-pr-12187.yml b/html/changelogs/AutoChangeLog-pr-12187.yml new file mode 100644 index 0000000000..d2ca3b3901 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12187.yml @@ -0,0 +1,4 @@ +author: "Trilbyspaceclone" +delete-after: True +changes: + - tweak: "Gasses like BZ and Masiam seem to just sell for less in cargo, markets seem to change it seems" From f3af445c94d8ed9108dc8436fa7f786bd07d8297 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 8 Jun 2020 18:09:53 +0200 Subject: [PATCH 23/26] Update material_container.dm (#12491) --- code/datums/components/material_container.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 5860bd029b..51dc4ee8f7 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -73,7 +73,7 @@ if(!material_amount) to_chat(user, "[I] does not contain sufficient materials to be accepted by [parent].") return - if((!precise_insertion || !GLOB.typecache_stack[I]) && !has_space(material_amount)) + if((!precise_insertion || !GLOB.typecache_stack[I.type]) && !has_space(material_amount)) to_chat(user, "[parent] has not enough space. Please remove materials from [parent] in order to insert more.") return user_insert(I, user) From 581470684a7704dfbcecf417fb45c964a4806543 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 8 Jun 2020 11:09:56 -0500 Subject: [PATCH 24/26] Automatic changelog generation for PR #12491 [ci skip] --- html/changelogs/AutoChangeLog-pr-12491.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12491.yml diff --git a/html/changelogs/AutoChangeLog-pr-12491.yml b/html/changelogs/AutoChangeLog-pr-12491.yml new file mode 100644 index 0000000000..0a5c65543a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12491.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixing IC material containers interaction with stacks, for real." From efddaa8cadee16655fca1d62cef720672a139421 Mon Sep 17 00:00:00 2001 From: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com> Date: Mon, 8 Jun 2020 18:10:06 +0200 Subject: [PATCH 25/26] removes early return (#12483) This early return, while skipping a few things, is a bad ideaas this pretty much allowed silicons to still interact with the station off-z as it 'skipped' the check for it. --- code/modules/mob/living/silicon/ai/ai.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 4e3093dda2..aab741edd6 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -285,8 +285,6 @@ . = ..() var/turf/ai = get_turf(src) var/turf/target = get_turf(A) - if (.) - return if(!target) return From a82064712f8d991b1d83a9737faca45bdb80def7 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Mon, 8 Jun 2020 11:10:09 -0500 Subject: [PATCH 26/26] Automatic changelog generation for PR #12483 [ci skip] --- html/changelogs/AutoChangeLog-pr-12483.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12483.yml diff --git a/html/changelogs/AutoChangeLog-pr-12483.yml b/html/changelogs/AutoChangeLog-pr-12483.yml new file mode 100644 index 0000000000..fc1d8076f8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12483.yml @@ -0,0 +1,4 @@ +author: "DeltaFire15" +delete-after: True +changes: + - bugfix: "Offstation AIs can once again only interact with their z-level"