From 95ebeac5b64147f5b541177d5d6178cf686c47c9 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Tue, 15 Sep 2020 17:27:11 -0700
Subject: [PATCH] fix
---
code/controllers/subsystem/persistence.dm | 19 -------------------
code/datums/mutations/_mutations.dm | 2 +-
.../items/devices/portable_chem_mixer.dm | 3 +--
code/game/objects/obj_defense.dm | 3 ---
.../antagonists/bloodsucker/powers/brawn.dm | 2 +-
.../antagonists/bloodsucker/powers/feed.dm | 2 +-
code/modules/recycling/disposal/bin.dm | 2 +-
7 files changed, 5 insertions(+), 28 deletions(-)
diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm
index 5b60747725..e1b6e6f6e2 100644
--- a/code/controllers/subsystem/persistence.dm
+++ b/code/controllers/subsystem/persistence.dm
@@ -48,25 +48,6 @@ SUBSYSTEM_DEF(persistence)
/datum/controller/subsystem/persistence/proc/LoadSatchels()
var/placed_satchel = 0
var/path
- if(fexists("data/npc_saves/SecretSatchels.sav")) //legacy conversion. Will only ever run once.
- var/savefile/secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav")
- for(var/map in secret_satchels)
- var/json_file = file("data/npc_saves/SecretSatchels[map].json")
- var/list/legacy_secret_satchels = splittext(secret_satchels[map],"#")
- var/list/satchels = list()
- for(var/i=1,i<=legacy_secret_satchels.len,i++)
- var/satchel_string = legacy_secret_satchels[i]
- var/list/chosen_satchel = splittext(satchel_string,"|")
- if(chosen_satchel.len == 3)
- var/list/data = list()
- data["x"] = text2num(chosen_satchel[1])
- data["y"] = text2num(chosen_satchel[2])
- data["saved_obj"] = chosen_satchel[3]
- satchels += list(data)
- var/list/file_data = list()
- file_data["data"] = satchels
- WRITE_FILE(json_file, json_encode(file_data))
- fdel("data/npc_saves/SecretSatchels.sav")
var/json_file = file("data/npc_saves/SecretSatchels[SSmapping.config.map_name].json")
var/list/json = list()
diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm
index fb5f6ed5f6..3bddfdaa63 100644
--- a/code/datums/mutations/_mutations.dm
+++ b/code/datums/mutations/_mutations.dm
@@ -11,7 +11,7 @@
var/lowest_value = 256 * 8
var/text_gain_indication = ""
var/text_lose_indication = ""
- var/list/mutable_appearance/visual_indicators = list()
+ var/list/visual_indicators = list()
var/obj/effect/proc_holder/spell/power
var/layer_used = MUTATIONS_LAYER //which mutation layer to use
var/list/species_allowed = list() //to restrict mutation to only certain species
diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
index 25ecef5955..3e1b20cfc2 100644
--- a/code/game/objects/items/devices/portable_chem_mixer.dm
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -113,8 +113,7 @@
if (loc != user)
return ..()
if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
- ui_interact(user)
- return
+ INVOKE_ASYNC(src, /datum.proc/ui_interact, user)
/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
if(loc == user)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index bcdf509fbe..3de28b38e8 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -204,9 +204,6 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/proc/acid_processing()
. = 1
if(!(resistance_flags & ACID_PROOF))
- for(var/armour_value in armor)
- if(armour_value != "acid" && armour_value != "fire")
- armor = armor.modifyAllRatings(0 - round(sqrt(acid_level)*0.1))
if(prob(33))
playsound(loc, 'sound/items/welder.ogg', 150, 1)
take_damage(min(1 + round(sqrt(acid_level)*0.3), 300), BURN, "acid", 0)
diff --git a/code/modules/antagonists/bloodsucker/powers/brawn.dm b/code/modules/antagonists/bloodsucker/powers/brawn.dm
index cf0393ff3a..6322800cf1 100644
--- a/code/modules/antagonists/bloodsucker/powers/brawn.dm
+++ b/code/modules/antagonists/bloodsucker/powers/brawn.dm
@@ -107,7 +107,7 @@
if(user_C.handcuffed)
var/obj/O = user_C.get_item_by_slot(SLOT_HANDCUFFED)
if(istype(O))
- //user_C.visible_message("[user_C] attempts to remove [O]!", \
+ //user_C.visible_message("[user_C] attempts to remove [O]!",
// "You snap [O] like it's nothing!")
user_C.clear_cuffs(O,TRUE)
playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1)
diff --git a/code/modules/antagonists/bloodsucker/powers/feed.dm b/code/modules/antagonists/bloodsucker/powers/feed.dm
index caca020b32..fa961a7e92 100644
--- a/code/modules/antagonists/bloodsucker/powers/feed.dm
+++ b/code/modules/antagonists/bloodsucker/powers/feed.dm
@@ -165,7 +165,7 @@
// Broadcast Message
if(amSilent)
//if (!iscarbon(target))
- // user.visible_message("[user] shifts [target] closer to [user.p_their()] mouth.", \
+ // user.visible_message("[user] shifts [target] closer to [user.p_their()] mouth.",
// "You secretly slip your fangs into [target]'s flesh.", \
// vision_distance = 2, ignored_mobs=target) // Only people who AREN'T the target will notice this action.
//else
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index c8da9ab5e3..b106005a15 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -263,7 +263,7 @@
. = ..()
if(.)
return
- for(var/obj/item/I in src_object)
+ for(var/obj/item/I in src_object.contents())
if(user.active_storage != src_object)
if(I.on_found(user))
return