From f9ef6a6d385e979f5b7b7176510623339f1df5b4 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sun, 4 Jul 2021 12:01:47 +0100
Subject: [PATCH 1/5] Observation Console Fix (#16296)
---
code/game/machinery/computer/camera_advanced.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm
index bc1bfe6135b..7a1dbdf91d9 100644
--- a/code/game/machinery/computer/camera_advanced.dm
+++ b/code/game/machinery/computer/camera_advanced.dm
@@ -75,7 +75,7 @@
for(var/obj/machinery/camera/C in GLOB.cameranet.cameras)
if(!C.can_use())
continue
- if(C.network&networks)
+ if(length(C.network & networks))
camera_location = get_turf(C)
break
if(camera_location)
From 3efc77a9e8551ce5a44a3ec4b0dc172c12736eb1 Mon Sep 17 00:00:00 2001
From: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com>
Date: Mon, 5 Jul 2021 13:27:53 -0400
Subject: [PATCH 2/5] fixes spelling error. (#16308)
---
code/game/objects/items/stacks/sheets/glass.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 9ed97abb045..26af8fd9ac2 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
new/datum/stack_recipe/window("fulltile window", /obj/structure/window/full/basic, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fishbowl", /obj/machinery/fishtank/bowl, 1, time = 10), \
new/datum/stack_recipe("fish tank", /obj/machinery/fishtank/tank, 3, time = 20, on_floor = TRUE), \
- new/datum/stack_recipe("wall aquariam", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
+ new/datum/stack_recipe("wall aquarium", /obj/machinery/fishtank/wall, 4, time = 40, on_floor = TRUE) \
))
/obj/item/stack/sheet/glass
From 22b83565d27e1a5164af8f2ecc6350c4bf37b359 Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Mon, 5 Jul 2021 18:28:18 +0100
Subject: [PATCH 3/5] damn rogue characters (#16309)
---
code/modules/reagents/chemistry/machinery/reagentgrinder.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 1c6981ff0b5..52a54e47a3b 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -246,7 +246,7 @@
if(!operating)
for (var/obj/item/O in holdingitems)
- processing_chamber += "\A [O.name]
"
+ processing_chamber += "\A [html_encode(O.name)]
"
if (!processing_chamber)
is_chamber_empty = 1
From 7c505d93d91b52f3e0df5e63498081ac3f6816d6 Mon Sep 17 00:00:00 2001
From: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date: Mon, 5 Jul 2021 13:18:20 -0500
Subject: [PATCH 4/5] Fixes a couple things related to miner borg upgrades and
kinetic accelerator modkits (#16306)
* miner borg upgrade fix
* re-add check
---
code/modules/mob/living/silicon/robot/robot_modules.dm | 2 +-
code/modules/projectiles/guns/energy/kinetic_accelerator.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 9e944853a0f..4cda181ee4f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -551,7 +551,7 @@
/obj/item/robot_module/miner/handle_custom_removal(component_id, mob/living/user, obj/item/W)
if(component_id == "KA modkits")
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/D in src)
- D.attackby(W, user)
+ D.crowbar_act(user, W)
return TRUE
return ..()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index c5bf8a131bb..8a30d27517a 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -275,7 +275,7 @@
return ..()
/obj/item/borg/upgrade/modkit/action(mob/living/silicon/robot/R)
- if(..())
+ if(!..())
return
for(var/obj/item/gun/energy/kinetic_accelerator/cyborg/H in R.module.modules)
From 1ab701e7312dd33c279828f899839e932200709f Mon Sep 17 00:00:00 2001
From: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date: Tue, 6 Jul 2021 21:56:12 +0100
Subject: [PATCH 5/5] fix (#16316)
---
code/modules/paperwork/pen.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index a0e7b47da13..25c83556882 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -137,7 +137,6 @@
*/
/obj/item/pen/edagger
origin_tech = "combat=3;syndicate=1"
- attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
var/on = 0
var/brightness_on = 2
light_color = LIGHT_COLOR_RED
@@ -149,6 +148,7 @@
sharp = 0
w_class = initial(w_class)
name = initial(name)
+ attack_verb = list()
hitsound = initial(hitsound)
embed_chance = initial(embed_chance)
throwforce = initial(throwforce)
@@ -161,6 +161,7 @@
sharp = 1
w_class = WEIGHT_CLASS_NORMAL
name = "energy dagger"
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/blade1.ogg'
embed_chance = 100 //rule of cool
throwforce = 35