From 9e16c4440bc335fcfd2cf28e6854c32c87bb4eaa Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Wed, 24 Jul 2024 16:20:01 -0700 Subject: [PATCH 1/6] Adds freed mob jobban (#345) --- code/modules/admin/banjob.dm | 6 ++++++ code/modules/mob/dead/observer/observer.dm | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 18f06e79a6..230590fdf9 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -146,6 +146,12 @@ WARNING!*/ else jobs += "Emergency Response Team" + //Freed Mobs + if(jobban_isbanned(M, "Freed Mob", P) || isbanned_dept) + jobs += "Freed Mob" + else + jobs += "Freed Mob" + //Survivor if(jobban_isbanned(M, "Survivor", P) || isbanned_dept) jobs += "Survivor" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 44a3592329..409c88388f 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -1034,6 +1034,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, SPAN_WARNING("The game hasn't started yet!")) return + if(jobban_isbanned(src, "Freed Mob")) + to_chat(src, SPAN_WARNING("You are banned from being able to join as a freed mob.")) + return + var/list/mobs_by_role = list() // the list the mobs are assigned to first, for sorting purposes for(var/mob/freed_mob as anything in GLOB.freed_mob_list) var/role_name = freed_mob.get_role_name() @@ -1059,6 +1063,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!istype(freed_mob) || !(freed_mob in GLOB.freed_mob_list)) return + if(jobban_isbanned(src, "Freed Mob")) + to_chat(src, SPAN_WARNING("You are banned from being able to join as a freed mob.")) + return + if(QDELETED(freed_mob) || freed_mob.client) GLOB.freed_mob_list -= freed_mob to_chat(src, SPAN_WARNING("Something went wrong.")) From f7166dceed51217b94f586d4746da53c25d15495 Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:20:12 -0500 Subject: [PATCH 2/6] Port-pvp-fixes-2 (#344) Co-authored-by: KoishiVibe --- code/game/objects/structures/fence.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index b29c69e8af..6a4b479929 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -3,6 +3,7 @@ desc = "A large metal mesh strewn between two poles. Intended as a cheap way to separate areas, while allowing one to see through it." icon = 'icons/obj/structures/props/fence.dmi' icon_state = "fence0" + throwpass = TRUE density = TRUE anchored = TRUE layer = WINDOW_LAYER From ceac4ab1903a40268726f1c70ee27a8980e8f0f1 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 25 Jul 2024 00:20:18 +0100 Subject: [PATCH 3/6] Automatic changelog for PR #345 [ci skip] --- html/changelogs/AutoChangeLog-pr-345.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-345.yml diff --git a/html/changelogs/AutoChangeLog-pr-345.yml b/html/changelogs/AutoChangeLog-pr-345.yml new file mode 100644 index 0000000000..8a315c2f78 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-345.yml @@ -0,0 +1,4 @@ +author: "Zonespace27" +delete-after: True +changes: + - admin: "Added freed mob bans to the jobban panel." \ No newline at end of file From 1c09c053ab3cbd6eb07cc764033fe8830c4ae807 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Wed, 24 Jul 2024 19:20:24 -0400 Subject: [PATCH 4/6] Port "SStechtree startup optimisation" (#343) Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com> --- code/controllers/subsystem/techtree.dm | 11 ----------- code/modules/cm_tech/techtree.dm | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/code/controllers/subsystem/techtree.dm b/code/controllers/subsystem/techtree.dm index 04ac2591bc..5f22373228 100644 --- a/code/controllers/subsystem/techtree.dm +++ b/code/controllers/subsystem/techtree.dm @@ -34,17 +34,6 @@ SUBSYSTEM_DEF(techtree) var/datum/space_level/zpos = SSmapping.add_new_zlevel(tree.name, list(ZTRAIT_TECHTREE)) tree.zlevel = zpos - var/zlevel = zpos.z_value - var/turf/z_min = locate(1, 1, zlevel) - var/turf/z_max = locate(world.maxx, world.maxy, zlevel) - - - - for(var/t in block(z_min, z_max)) - var/turf/Tu = t - Tu.ChangeTurf(/turf/closed/void, list(/turf/closed/void)) - new /area/techtree(Tu) - for(var/tier in tree.tree_tiers) tree.unlocked_techs += tier tree.all_techs += tier diff --git a/code/modules/cm_tech/techtree.dm b/code/modules/cm_tech/techtree.dm index 6c39d8ab9c..a027789185 100644 --- a/code/modules/cm_tech/techtree.dm +++ b/code/modules/cm_tech/techtree.dm @@ -58,16 +58,24 @@ if(longest_tier < tier_length) longest_tier = tier_length - // Clear out the area - for(var/t in block(locate(1, 1, zlevel.z_value), locate(longest_tier * 2 + 1, length(all_techs) * 3 + 1, zlevel.z_value))) + // Clear out and create the area + // (The `+ 2` on both of these is 1 for a buffer tile, and 1 for the outer `/turf/closed/void`.) + var/area_max_x = longest_tier * 2 + 2 + var/area_max_y = length(all_techs) * 3 + 2 + for(var/t in block(locate(1, 1, zlevel.z_value), locate(area_max_x, area_max_y, zlevel.z_value))) var/turf/pos = t for(var/A in pos) qdel(A) - pos.ChangeTurf(/turf/open/blank) - pos.color = "#000000" - + if(pos.x == area_max_x || pos.y == area_max_y) + // The turfs around the edge are closed. + pos.ChangeTurf(/turf/closed/void) + else + pos.ChangeTurf(/turf/open/blank) + pos.color = "#000000" + new /area/techtree(pos) + // Create the tech nodes var/y_offset = 1 for(var/tier in all_techs) var/tier_length = length(all_techs[tier]) From 8517546a57931a1bc41be78d73716734af730f44 Mon Sep 17 00:00:00 2001 From: cm13-github <128137806+cm13-github@users.noreply.github.com> Date: Thu, 25 Jul 2024 00:23:51 +0100 Subject: [PATCH 5/6] Automatic changelog for PR #343 [ci skip] --- html/changelogs/AutoChangeLog-pr-343.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-343.yml diff --git a/html/changelogs/AutoChangeLog-pr-343.yml b/html/changelogs/AutoChangeLog-pr-343.yml new file mode 100644 index 0000000000..750b27e47e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-343.yml @@ -0,0 +1,4 @@ +author: "Doubleumc" +delete-after: True +changes: + - code_imp: "Made the Tech Tree subsystem initialise faster." \ No newline at end of file From c3742c9dbaeb986d5e4c1e06064a2379241bd05b Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 25 Jul 2024 01:16:20 +0000 Subject: [PATCH 6/6] Automatic changelog compile [ci skip] --- html/changelogs/AutoChangeLog-pr-343.yml | 4 ---- html/changelogs/AutoChangeLog-pr-345.yml | 4 ---- html/changelogs/archive/2024-07.yml | 5 +++++ 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-343.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-345.yml diff --git a/html/changelogs/AutoChangeLog-pr-343.yml b/html/changelogs/AutoChangeLog-pr-343.yml deleted file mode 100644 index 750b27e47e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-343.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Doubleumc" -delete-after: True -changes: - - code_imp: "Made the Tech Tree subsystem initialise faster." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-345.yml b/html/changelogs/AutoChangeLog-pr-345.yml deleted file mode 100644 index 8a315c2f78..0000000000 --- a/html/changelogs/AutoChangeLog-pr-345.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Zonespace27" -delete-after: True -changes: - - admin: "Added freed mob bans to the jobban panel." \ No newline at end of file diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index a8046763ac..f171a09f14 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -9,3 +9,8 @@ Doubleumc: - bugfix: sounds & motion detectors should be more reliable - rscdel: Removed automatic end of round vote and reboot +2024-07-25: + Doubleumc: + - code_imp: Made the Tech Tree subsystem initialise faster. + Zonespace27: + - admin: Added freed mob bans to the jobban panel.