From 62df48b2f0ccd1a415c1d740caf64d7a656beb48 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sat, 11 Jul 2020 15:11:53 -0700
Subject: [PATCH 1/8] Update robot_upgrades.dm
---
code/game/objects/items/robot/robot_upgrades.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index d33ecedf0a..9fbedb33cd 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -566,7 +566,7 @@
/obj/item/borg/upgrade/expand/deactivate(mob/living/silicon/robot/R, user = usr)
. = ..()
- if (.)
+ if (. && R.hasExpanded)
R.resize = 0.5
R.hasExpanded = FALSE
R.update_transform()
From b94c1ab709b4c6ecb27708648976ce3f9b84dcae Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 12 Jul 2020 06:10:26 -0700
Subject: [PATCH 2/8] Update output.dm
---
.../integrated_electronics/subtypes/output.dm | 53 ++++++++-----------
1 file changed, 23 insertions(+), 30 deletions(-)
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 47b6e151cb..3d3010c0c8 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -35,7 +35,7 @@
stuff_to_display = replacetext("[I.data]", eol , "
")
/obj/item/integrated_circuit/output/screen/large
- name = "large screen"
+ name = "medium screen"
desc = "Takes any data type as an input and displays it to anybody near the device when pulsed. \
It can also be examined to see the last thing it displayed."
icon_state = "screen_medium"
@@ -51,15 +51,29 @@
else
if(!isturf(assembly.loc))
return
+
+ var/atom/host = assembly || src
+ var/list/mobs = list()
+ for(var/mob/M in range(0, get_turf(src)))
+ mob += M
+ to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]")
+ host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
- var/list/nearby_things = range(0, get_turf(src))
- for(var/mob/M in nearby_things)
- var/obj/O = assembly ? assembly : src
- to_chat(M, "[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]")
- if(assembly)
- assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT)
- else
- investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
+/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large
+ name = "large screen"
+ desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed."
+ icon_state = "screen_large"
+ power_draw_per_use = 40
+ cooldown_per_use = 10
+
+/obj/item/integrated_circuit/output/screen/extralarge/do_work()
+ ..()
+ var/atom/host = assembly || src
+ var/list/mobs = list()
+ for(var/mob/M in view(7, get_turf(src)))
+ mob += M
+ to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]")
+ host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
/obj/item/integrated_circuit/output/light
name = "light"
@@ -389,25 +403,4 @@
//Hippie Ported Code--------------------------------------------------------------------------------------------------------
-
-
/obj/item/radio/headset/integrated
-
-/obj/item/integrated_circuit/output/screen/large
- name = "medium screen"
-
-/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large
- name = "large screen"
- desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed."
- icon_state = "screen_large"
- power_draw_per_use = 40
- cooldown_per_use = 10
-
-/obj/item/integrated_circuit/output/screen/extralarge/do_work()
- ..()
- var/obj/O = assembly ? get_turf(assembly) : loc
- O.visible_message("[icon2html(O.icon, world, O.icon_state)] [stuff_to_display]")
- if(assembly)
- assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT)
- else
- investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
From d9a7e860dd4e3cd89eb66fa0a2edf135e65283f1 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 12 Jul 2020 06:13:19 -0700
Subject: [PATCH 3/8] Update output.dm
---
code/modules/integrated_electronics/subtypes/output.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 3d3010c0c8..ad4d1c3891 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -70,7 +70,7 @@
..()
var/atom/host = assembly || src
var/list/mobs = list()
- for(var/mob/M in view(7, get_turf(src)))
+ for(var/mob/M in viewers(7, get_turf(src)))
mob += M
to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]")
host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
From 6bf209d9a5330cadd0c6808205d01ed6a9554fc1 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 12 Jul 2020 06:56:48 -0700
Subject: [PATCH 4/8] Update output.dm
---
code/modules/integrated_electronics/subtypes/output.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index ad4d1c3891..efd98c4d50 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -55,8 +55,8 @@
var/atom/host = assembly || src
var/list/mobs = list()
for(var/mob/M in range(0, get_turf(src)))
- mob += M
- to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]")
+ mobs += M
+ to_chat(mobs, "[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]")
host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large
@@ -71,8 +71,8 @@
var/atom/host = assembly || src
var/list/mobs = list()
for(var/mob/M in viewers(7, get_turf(src)))
- mob += M
- to_chat(mobs, "[icon2html(host.icon, world, O.icon_state)] flashes a message: [stuff_to_display]")
+ mobs += M
+ to_chat(mobs, "[icon2html(host.icon, world, host.icon_state)] flashes a message: [stuff_to_display]")
host.investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
/obj/item/integrated_circuit/output/light
From ac0692cc17695422a34c0020ce5e9469a58f0322 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Mon, 13 Jul 2020 11:50:06 -0500
Subject: [PATCH 5/8] Automatic changelog generation for PR #12706 [ci skip]
---
html/changelogs/AutoChangeLog-pr-12706.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-12706.yml
diff --git a/html/changelogs/AutoChangeLog-pr-12706.yml b/html/changelogs/AutoChangeLog-pr-12706.yml
new file mode 100644
index 0000000000..df44441334
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12706.yml
@@ -0,0 +1,4 @@
+author: "silicons"
+delete-after: True
+changes:
+ - rscadd: "sec and medical records have been added to character setup."
From 8de062adbbdc4ed5ade398dec4501bb662e49b10 Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Mon, 13 Jul 2020 19:46:51 +0100
Subject: [PATCH 6/8] fix
---
code/game/objects/items/cards_ids.dm | 19 ++++++++++---------
code/modules/mining/mint.dm | 11 +++++------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 60e869815b..9a371e3de0 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -250,15 +250,13 @@
return ..()
/obj/item/card/id/proc/insert_money(obj/item/I, mob/user, physical_currency)
+ if(!registered_account)
+ to_chat(user, "[src] doesn't have a linked account to deposit [I] into!")
+ return
var/cash_money = I.get_item_credit_value()
if(!cash_money)
to_chat(user, "[I] doesn't seem to be worth anything!")
return
-
- if(!registered_account)
- to_chat(user, "[src] doesn't have a linked account to deposit [I] into!")
- return
-
registered_account.adjust_money(cash_money)
if(physical_currency)
to_chat(user, "You stuff [I] into [src]. It disappears in a small puff of bluespace smoke, adding [cash_money] credits to the linked account.")
@@ -269,17 +267,20 @@
qdel(I)
/obj/item/card/id/proc/mass_insert_money(list/money, mob/user)
+ if(!registered_account)
+ to_chat(user, "[src] doesn't have a linked account to deposit into!")
+ return FALSE
+
if (!money || !money.len)
return FALSE
var/total = 0
for (var/obj/item/physical_money in money)
- var/cash_money = physical_money.get_item_credit_value()
+ total += physical_money.get_item_credit_value()
+ CHECK_TICK
- total += cash_money
-
- registered_account.adjust_money(cash_money)
+ registered_account.adjust_money(total)
QDEL_LIST(money)
diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm
index e89bbef58d..84c6c416b7 100644
--- a/code/modules/mining/mint.dm
+++ b/code/modules/mining/mint.dm
@@ -11,7 +11,7 @@
var/chosen = /datum/material/iron //which material will be used to make coins
var/coinsToProduce = 10
speed_process = TRUE
-
+ var/obj/item/storage/bag/money/bag_to_use
/obj/machinery/mineral/mint/Initialize()
. = ..()
@@ -118,9 +118,8 @@
temp_list[chosen] = 400
if(T)
var/obj/item/O = new /obj/item/coin(src)
- var/obj/item/storage/bag/money/B = locate(/obj/item/storage/bag/money, T)
O.set_custom_materials(temp_list)
- if(!B)
- B = new /obj/item/storage/bag/money(src)
- unload_mineral(B)
- O.forceMove(B)
+ if(QDELETED(bag_to_use) || (bag_to_use.loc != T) || !SEND_SIGNAL(bag_to_use, COMSIG_TRY_STORAGE_INSERT, O, null, TRUE)) //important to send the signal so we don't overfill the bag.
+ bag_to_use = new(src) //make a new bag if we can't find or use the old one.
+ unload_mineral(bag_to_use) //just forcemove memes.
+ O.forceMove(bag_to_use) //don't bother sending the signal, the new bag is empty and all that.
From b7384825211175e432d25e7716749c4cc73e91f4 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Mon, 13 Jul 2020 17:01:24 -0500
Subject: [PATCH 7/8] Automatic changelog generation for PR #12764 [ci skip]
---
html/changelogs/AutoChangeLog-pr-12764.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-12764.yml
diff --git a/html/changelogs/AutoChangeLog-pr-12764.yml b/html/changelogs/AutoChangeLog-pr-12764.yml
new file mode 100644
index 0000000000..39909ec6b2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-12764.yml
@@ -0,0 +1,4 @@
+author: "timothyteakettle"
+delete-after: True
+changes:
+ - bugfix: "ports a money bag exploit"
From b9f86e770eceb715f017323722a579ee73ea971f Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Tue, 14 Jul 2020 00:09:58 +0000
Subject: [PATCH 8/8] Automatic changelog compile [ci skip]
---
html/changelog.html | 12 ++++++++++++
html/changelogs/.all_changelog.yml | 8 ++++++++
html/changelogs/AutoChangeLog-pr-12706.yml | 4 ----
html/changelogs/AutoChangeLog-pr-12737.yml | 4 ----
html/changelogs/AutoChangeLog-pr-12746.yml | 4 ----
html/changelogs/AutoChangeLog-pr-12764.yml | 4 ----
6 files changed, 20 insertions(+), 16 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-12706.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-12737.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-12746.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-12764.yml
diff --git a/html/changelog.html b/html/changelog.html
index be626132cb..ebc042889c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,18 @@
-->
+
14 July 2020
+
silicons updated:
+
+ - chemical reactions now are sorted by priority first and temperature second.
+ - sec and medical records have been added to character setup.
+ - circuit reagent heaters are now sanitized for temperature from 2.7 to 1000.
+
+
timothyteakettle updated:
+
+ - ports a money bag exploit
+
+
13 July 2020
Linzolle updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index dd8db8bb5c..31b63b7503 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26350,3 +26350,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Owai-Seek:
- tweak: Trashbags can now hold most shoes, and organs.
- balance: You can no longer nest nuke disks or hold brains in the trash.
+2020-07-14:
+ silicons:
+ - rscadd: chemical reactions now are sorted by priority first and temperature second.
+ - rscadd: sec and medical records have been added to character setup.
+ - bugfix: circuit reagent heaters are now sanitized for temperature from 2.7 to
+ 1000.
+ timothyteakettle:
+ - bugfix: ports a money bag exploit
diff --git a/html/changelogs/AutoChangeLog-pr-12706.yml b/html/changelogs/AutoChangeLog-pr-12706.yml
deleted file mode 100644
index df44441334..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12706.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "sec and medical records have been added to character setup."
diff --git a/html/changelogs/AutoChangeLog-pr-12737.yml b/html/changelogs/AutoChangeLog-pr-12737.yml
deleted file mode 100644
index f2c00ee6da..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12737.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "circuit reagent heaters are now sanitized for temperature from 2.7 to 1000."
diff --git a/html/changelogs/AutoChangeLog-pr-12746.yml b/html/changelogs/AutoChangeLog-pr-12746.yml
deleted file mode 100644
index a81e5907ad..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12746.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "chemical reactions now are sorted by priority first and temperature second."
diff --git a/html/changelogs/AutoChangeLog-pr-12764.yml b/html/changelogs/AutoChangeLog-pr-12764.yml
deleted file mode 100644
index 39909ec6b2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12764.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "ports a money bag exploit"