From 780a579c7be6af83da5faf9acd94bb4606b00c93 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Mon, 17 May 2021 12:20:15 -0700
Subject: [PATCH 1/8] Update SDQL_2_wrappers.dm
---
code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 4f518b7f8e..ca07f9a50b 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -238,3 +238,9 @@
/proc/__nan()
var/list/L = json_decode("{\"value\":NaN}")
return L["value"]
+
+/**
+ * Wrapper to return a copy of contents, as SDQL2 can't tell an internal list from a normal list.
+ */
+/atom/proc/_contents()
+ return contents.Copy()
From 9dd372ed11c1a765626d9fd50ab6979c3596bb2e Mon Sep 17 00:00:00 2001
From: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Date: Mon, 17 May 2021 17:33:23 -0300
Subject: [PATCH 2/8] fix void cloak going to the void
---
code/modules/antagonists/eldritch_cult/eldritch_items.dm | 7 ++++---
code/modules/mob/living/carbon/human/examine.dm | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index 0dd9cf6bea..1f7eb4ab8b 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -218,8 +218,8 @@
flags_inv = NONE
flags_cover = NONE
desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, with each flash you lose comprehension of what you are seeing."
- item_flags = EXAMINE_SKIP
armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+ obj_flags = NONE | EXAMINE_SKIP
/obj/item/clothing/suit/hooded/cultrobes/void
name = "void cloak"
@@ -242,9 +242,10 @@
//We need to account for the hood shenanigans, and that way we can make sure items always fit, even if one of the slots is used by the fucking hood.
if(suittoggled)
to_chat(carbon_user,"The light shifts around you making the cloak invisible!")
- else
+ obj_flags |= EXAMINE_SKIP
+ else if(obj_flags & EXAMINE_SKIP) // ensures that it won't toggle visibility if raising the hood failed
to_chat(carbon_user,"The kaleidoscope of colours collapses around you, as the cloak shifts to visibility!")
- item_flags = suittoggled ? EXAMINE_SKIP : ~EXAMINE_SKIP
+ obj_flags ^= EXAMINE_SKIP
else
to_chat(carbon_user,"You can't force the hood onto your head!")
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 31ab636ceb..aa14fe6013 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -41,10 +41,10 @@
. += "[t_He] [t_is] wearing [w_uniform.get_examine_string(user)][accessory_msg]."
//head
- if(head && !(head.item_flags & EXAMINE_SKIP))
+ if(head && !(head.obj_flags & EXAMINE_SKIP))
. += "[t_He] [t_is] wearing [head.get_examine_string(user)] on [t_his] head."
//suit/armor
- if(wear_suit && !(wear_suit.item_flags & EXAMINE_SKIP))
+ if(wear_suit && !(wear_suit.obj_flags & EXAMINE_SKIP))
. += "[t_He] [t_is] wearing [wear_suit.get_examine_string(user)]."
//suit/armor storage
if(s_store && !(SLOT_S_STORE in obscured))
From ba20b5b8aa3332b2550c21f465ab43b83446f971 Mon Sep 17 00:00:00 2001
From: qweq12yt <45515587+qweq12yt@users.noreply.github.com>
Date: Mon, 17 May 2021 18:48:01 -0300
Subject: [PATCH 3/8] fix emag shuttle order
---
code/game/machinery/computer/communications.dm | 1 +
.../mob/living/simple_animal/hostile/megafauna/bubblegum.dm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 048247c630..d49b4e54b4 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -83,6 +83,7 @@
authorize_access = get_all_accesses()
to_chat(user, "You scramble the communication routing circuits!")
playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE)
+ SSshuttle.shuttle_purchase_requirements_met["emagged"] = TRUE
return
/obj/machinery/computer/communications/ui_act(action, list/params)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index b1441ce55f..5305813ebf 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -134,7 +134,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/grant_achievement(medaltype,scoretype)
. = ..()
if(.)
- SSshuttle.shuttle_purchase_requirements_met |= "bubblegum"
+ SSshuttle.shuttle_purchase_requirements_met["bubblegum"] = TRUE
/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
if(!charging)
From fc31453587135881d557cd42c6a4943bcedbc13e Mon Sep 17 00:00:00 2001
From: Putnam
Date: Tue, 18 May 2021 16:27:07 -0700
Subject: [PATCH 4/8] Makes antags actually get activity properly
---
code/modules/antagonists/_common/antag_datum.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index 93b2e20271..ba3d8106ef 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -111,7 +111,7 @@ GLOBAL_LIST_EMPTY(antagonists)
var/datum/skill_modifier/job/M = GLOB.skill_modifiers[GET_SKILL_MOD_ID(A, type)]
if(istype(M))
M.name = "[name] Training"
- owner.AddComponent(/datum/component/activity)
+ owner.current.AddComponent(/datum/component/activity)
SEND_SIGNAL(owner.current, COMSIG_MOB_ANTAG_ON_GAIN, src)
/datum/antagonist/proc/is_banned(mob/M)
From a8b5484b48c93e8781ecc7740b4fa99e00cabfd9 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Wed, 19 May 2021 14:49:03 -0500
Subject: [PATCH 5/8] Automatic changelog generation for PR #14733 [ci skip]
---
html/changelogs/AutoChangeLog-pr-14733.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-14733.yml
diff --git a/html/changelogs/AutoChangeLog-pr-14733.yml b/html/changelogs/AutoChangeLog-pr-14733.yml
new file mode 100644
index 0000000000..807a92d285
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14733.yml
@@ -0,0 +1,5 @@
+author: "qweq12yt"
+delete-after: True
+changes:
+ - bugfix: "Fixed void cloak voiding itself into oblivion."
+ - bugfix: "You can now order emag shuttles again."
From f3024d48ea5e5b83855a4c08bb29b9b5cbf5e582 Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Thu, 20 May 2021 00:27:46 +0000
Subject: [PATCH 6/8] Automatic changelog compile [ci skip]
---
html/changelog.html | 22 +++++++++++-----------
html/changelogs/.all_changelog.yml | 6 ++++++
html/changelogs/AutoChangeLog-pr-14653.yml | 4 ----
html/changelogs/AutoChangeLog-pr-14733.yml | 5 -----
4 files changed, 17 insertions(+), 20 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-14653.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-14733.yml
diff --git a/html/changelog.html b/html/changelog.html
index d5472f772f..19aaf87564 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,17 @@
-->
+
20 May 2021
+
qweq12yt updated:
+
+ - Fixed void cloak voiding itself into oblivion.
+ - You can now order emag shuttles again.
+
+
timothyteakettle updated:
+
+ - ports rp's marking system
+
+
19 May 2021
WanderingFox95 updated:
@@ -750,17 +761,6 @@
- fixes spriteless heretic book
-
- 18 March 2021
- Arturlang updated:
-
- - Combat mode right click and right click verb give's are now actualyl targeted
-
- Hatterhat updated:
-
- - Hypospray vials are now printable from the medical techshift start.
- - Empty hypospray kits are now printable behind biological technology. tweak: Quantum electromag (T4 lasers) are now behind Advanced Bluespace like the rest of T4.
-
+
21 May 2021
+
Putnam3145 updated:
+
+ - Fixed activity being attached to minds instead of mobs on antag attach.
+
+
20 May 2021
qweq12yt updated:
@@ -730,37 +736,6 @@
- Bluespace beaker filling icons for that narrow band between 90 and 80% full now actually exist.
-
- 19 March 2021
- DeltaFire15 updated:
-
- - Bluespace jars can no longer be printed / acquired from lathes / techwebs. tweak: The travelling animal trader now gives you your reward in a one-use bluespace jar.
-
- Putnam3145 updated:
-
- - "Antag" role that can be toggled to disable all antags
-
- SandPoot updated:
-
- - Tactitool Skirtleneck.
- - Adds the tactitool skirtleneck to the loadout.
-
- kiwedespars updated:
-
- - New heretic path - Path of Void- it specializes in being extremely stealthy. tweak : Removed curse of blindness replaced with mask of madness. hey it even rhymes.
- - fixes heretic mass deletion during transmutation bug.
- - Fixes heretic brews being permanent.
- - Fixes void storm breaking after resurrecting. tweak: Heretic has received a minor textual facelift. tweak: Heretics who finish the Void Path and become an Aristocrat of the Void can now survive in the Void (space).
- - Heretics who research Aristocrats Way on the Void Path will no longer suffocate in their own storm when they ascend (no longer breathes).
- - Mark of Void and Seeking Blade are once again exclusive only to Void.
- - Carving knife now deals more damage on throw and can embed in your enemies. tweak: Grasp of Rust only rusts floors and machines on harm intent. tweak: when u choose a sac target as heretic it ll also tell the job of the sac
- - 2 new void spells, one a placeholder.
- - flesh mansus grasp buffed, now gives you 5u eldritch fluid when hitting someone.
-
- zeroisthebiggay updated:
-
- - fixes spriteless heretic book
-