diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index e0e00b92b9..33ca4022fd 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -31,9 +31,9 @@
if(move_to_lair)
send_to_lair()
var/mob/living/carbon/human/H = owner.current
- H.canloadappearance = TRUE
- H.checkloadappearance()
- . = ..()
+ var/load_character = alert(H.client, "Load currently selected slot?", "Play as your character!", "Yes", "No"))
+ if(load_character == "Yes")
+ H.load_client_appearance(H.client)
if(allow_rename)
rename_wizard()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 29acb6c354..47f76673b5 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -149,8 +149,6 @@
var/registered_z
- var/canloadappearance = FALSE
-
var/list/alerts = list() // contains /atom/movable/screen/alert only // On /mob so clientless mobs will throw alerts properly
var/list/client_colours = list()
var/hud_type = /datum/hud
diff --git a/modular_splurt/code/game/area/areas/ruins/space.dm b/modular_splurt/code/game/area/areas/ruins/space.dm
index 112ee10f1f..4b6b0ee44f 100644
--- a/modular_splurt/code/game/area/areas/ruins/space.dm
+++ b/modular_splurt/code/game/area/areas/ruins/space.dm
@@ -57,7 +57,7 @@
short_desc = "You are a syndicate comms agent, employed to listen in on Nanotrasen Comms Chatter."
flavour_text = "Use the communication equipment to provide support to any field agents, and sow disinformation to throw Nanotrasen off your trail. Do not let the base fall into enemy hands!"
important_info = "DO NOT abandon the base."
- canloadappearance = TRUE
+ can_load_appearance = TRUE
/datum/outfit/syndicate_comms_space
name = "Space Syndicate Comms Agent"
diff --git a/modular_splurt/code/game/objects/items/implants/implant_hide_backpack.dm b/modular_splurt/code/game/objects/items/implants/implant_hide_backpack.dm
index 5a0d4ada8f..ae8adae0a7 100644
--- a/modular_splurt/code/game/objects/items/implants/implant_hide_backpack.dm
+++ b/modular_splurt/code/game/objects/items/implants/implant_hide_backpack.dm
@@ -89,7 +89,7 @@
button_icon_state = "backpack"
// Update icon state
- UpdateButtonIcon()
+ UpdateButtons()
// Display fake sparks to match flavor text
do_fake_sparks(2,FALSE,action_owner)
diff --git a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
index ff6a81269e..63205fa4df 100644
--- a/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
+++ b/modular_splurt/code/game/objects/structures/ghost_role_spawners.dm
@@ -41,7 +41,6 @@
short_desc = "You are a hermit abandoned by fate."
flavour_text = "You've survived weeks in this hellish place. Maybe you want to live here with ash tribe or return to civilisation. \
Only you know how you got to this planetoid, whether this place in which you woke up was one of your shelters, or you just stumbled upon it."
- canloadappearance = TRUE
/obj/effect/mob_spawn/human/wandering_hermit/Destroy()
var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
@@ -69,7 +68,7 @@
death = FALSE
roundstart = FALSE
random = TRUE
- canloadappearance = TRUE
+ can_load_appearance = TRUE
id_job = "Hotel Staff"
id = /obj/item/card/id/away/hotel/splurt
uniform = /obj/item/clothing/under/suit/red
diff --git a/modular_splurt/code/modules/antagonists/bloodsucker/levelup.dm b/modular_splurt/code/modules/antagonists/bloodsucker/levelup.dm
index d8706ca324..70b98067b9 100644
--- a/modular_splurt/code/modules/antagonists/bloodsucker/levelup.dm
+++ b/modular_splurt/code/modules/antagonists/bloodsucker/levelup.dm
@@ -14,17 +14,17 @@
-/datum/action/bloodsucker/levelup
+/datum/action/cooldown/bloodsucker/levelup
name = "Forced Evolution"
desc = "Spend the lovely sanguine running through your veins; aging you at an accelerated rate."
button_icon_state = "power_feed"
var/total_uses = 1
bloodcost = 50
- cooldown = 50
+ cooldown_time = 50
bloodsucker_can_buy = TRUE
-/datum/action/bloodsucker/levelup/CheckCanUse(display_error)
+/datum/action/cooldown/bloodsucker/levelup/CheckCanUse(display_error)
. = ..()
if(!.)
return
@@ -32,7 +32,7 @@
return TRUE
-/datum/action/bloodsucker/levelup/ActivatePower()
+/datum/action/cooldown/bloodsucker/levelup/ActivatePower()
var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)
if(istype(bloodsuckerdatum))
bloodsuckerdatum.ForcedRankUp() // Rank up! Must still be in a coffin to level!
diff --git a/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm b/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
index 439d1a2053..51feb1ed70 100644
--- a/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
+++ b/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
@@ -200,7 +200,7 @@
user.reveal(reveal)
user.stun(stun)
if(action)
- action.UpdateButtonIcon()
+ action.UpdateButtons()
return TRUE
//Overload Light: Breaks a light that's online and sends out lightning bolts to all nearby people.
diff --git a/modular_splurt/code/modules/client/preferences.dm b/modular_splurt/code/modules/client/preferences.dm
index 275c30b527..8b41091ac9 100644
--- a/modular_splurt/code/modules/client/preferences.dm
+++ b/modular_splurt/code/modules/client/preferences.dm
@@ -708,8 +708,6 @@
//SKYRAT CHANGES END
dat += "Shift view when pixelshifting: [view_pixelshift ? "Enabled" : "Disabled"]
" //SPLURT Edit
dat += "
"
- dat += "Action Buttons: [(buttons_locked) ? "Locked In Place" : "Unlocked"]
"
- dat += "
"
dat += "PDA Color: [pda_color] Change
"
dat += "PDA Style: [pda_style]
"
dat += "PDA Reskin: [pda_skin]
"
@@ -1691,7 +1689,7 @@
/datum/reagent/fermi/PEsmaller,
/datum/reagent/fermi/AEsmaller_hypo,
// Code comment here, whoever named the AEsmaller_hypo needs to understand the chem shouldn't be named after the fact it's found in a hypo
-
+
// Causes positive mood bonus
// On overdose: Causes negative mood penalty and disgust
/datum/reagent/drug/copium/gfluid,
diff --git a/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index abc5205023..767c18d6c3 100644
--- a/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -115,7 +115,7 @@
return
S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_SKYFALL, skyfall_cooldown_time)
button_icon_state = "mech_savannah_cooldown"
- UpdateButtonIcon()
+ UpdateButtons()
addtimer(CALLBACK(src, .proc/reset_button_icon), skyfall_cooldown_time)
for(var/mob/living/shaken in range(7, chassis))
shake_camera(shaken, 3, 3)
@@ -218,7 +218,7 @@
*/
/datum/action/vehicle/sealed/mecha/skyfall/proc/reset_button_icon()
button_icon_state = "mech_savannah"
- UpdateButtonIcon()
+ UpdateButtons()
/datum/action/vehicle/sealed/mecha/ivanov_strike
name = "Ivanov Strike"
@@ -254,7 +254,7 @@
*/
/datum/action/vehicle/sealed/mecha/ivanov_strike/proc/reset_button_icon()
button_icon_state = "mech_ivanov"
- UpdateButtonIcon()
+ UpdateButtons()
/**
* ## start_missile_targeting
@@ -322,7 +322,7 @@
"explosionSize" = list(0,0,1,2)
))
button_icon_state = "mech_ivanov_cooldown"
- UpdateButtonIcon()
+ UpdateButtons()
addtimer(CALLBACK(src, /datum/action/vehicle/sealed/mecha/ivanov_strike.proc/reset_button_icon), strike_cooldown_time)
//misc effects