Merge pull request #15486 from SandPoot/kills-cache

Solves issues with overlays by updating the whole subsystem
This commit is contained in:
deathride58
2024-04-12 23:31:54 -04:00
committed by GitHub
36 changed files with 280 additions and 214 deletions
-1
View File
@@ -307,7 +307,6 @@ GLOBAL_VAR_INIT(say_disabled, FALSE)
qdel(I)
randomize_human(D)
JB.equip(D, TRUE, FALSE)
COMPILE_OVERLAYS(D)
var/icon/I = icon(getFlatIcon(D), frame = 1)
final.Insert(I, JB.title)
qdel(D)
@@ -314,7 +314,6 @@
equipAntagOnDummy(mannequin, ert)
COMPILE_OVERLAYS(mannequin)
CHECK_TICK
var/icon/preview_icon = icon('icons/effects/effects.dmi', "nothing")
preview_icon.Scale(48+32, 16+32)
@@ -391,7 +391,6 @@ GLOBAL_LIST_EMPTY(antagonists)
/datum/antagonist/proc/render_preview_outfit(datum/outfit/outfit, mob/living/carbon/human/dummy)
dummy = dummy || new /mob/living/carbon/human/dummy/consistent
dummy.equipOutfit(outfit, visualsOnly = TRUE)
COMPILE_OVERLAYS(dummy)
var/icon = getFlatIcon(dummy)
// We don't want to qdel the dummy right away, since its items haven't initialized yet.
@@ -13,6 +13,7 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "camera"
icon_keyboard = null
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
/obj/machinery/computer/camera_advanced/abductor/CreateEye()
-1
View File
@@ -1342,7 +1342,6 @@ GLOBAL_LIST_INIT(hallucination_list, list(
var/datum/preferences/prefs = C.client.prefs
var/mob/living/carbon/human/dummy/M = generate_or_wait_for_human_dummy(DUMMY_HUMAN_SLOT_HALLUCINATION)
prefs.copy_to(M)
COMPILE_OVERLAYS(M)
CHECK_TICK
image = image(M,C)
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_HALLUCINATION)
+1
View File
@@ -15,6 +15,7 @@
name = "auxillary base management console"
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_available"
icon_keyboard = null
var/shuttleId = "colony_drop"
desc = "Allows a deployable expedition base to be dropped from the station to a designated mining location. It can also \
interface with the mining shuttle at the landing site if a mobile beacon is also deployed."
@@ -70,7 +70,6 @@
mannequin.regenerate_icons()
COMPILE_OVERLAYS(mannequin)
parent.show_character_previews(new /mutable_appearance(mannequin))
unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
+4 -2
View File
@@ -20,7 +20,8 @@
var/chargerate = 100 //how much power is given every tick in a recharger
var/self_recharge = 0 //does it self recharge, over time, or not?
var/ratingdesc = TRUE
var/grown_battery = FALSE // If it's a grown that acts as a battery, add a wire overlay to it.
///If it's a grown that acts as a battery, add a wire overlay to it.
var/grown_battery = FALSE
rad_flags = RAD_NO_CONTAMINATE // Prevent the same cheese as with the stock parts
/obj/item/stock_parts/cell/get_cell()
@@ -61,7 +62,8 @@
/obj/item/stock_parts/cell/update_overlays()
. = ..()
if(grown_battery)
. += image('icons/obj/power.dmi',"grown_wires")
. += image('icons/obj/power.dmi', "grown_wires")
return
if(charge < 0.01)
return
else if(charge/maxcharge >=0.995)
@@ -220,6 +220,7 @@
can_suppress = FALSE
burst_size = 3
burst_shot_delay = 1
automatic_burst_overlay = FALSE
// Bulldog shotgun //
@@ -45,6 +45,8 @@
desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser/practice)
icon_state = "decloner"
//You have no icons for energy types, you're a decloner
modifystate = FALSE
/obj/item/gun/energy/e_gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
@@ -78,6 +80,7 @@
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
modifystate = FALSE
can_flashlight = 0
ammo_x_offset = 1
@@ -7,6 +7,7 @@
density = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "mixer0"
icon_keyboard = null
use_power = TRUE
idle_power_usage = 20
resistance_flags = ACID_PROOF
+1
View File
@@ -45,6 +45,7 @@
desc = "Controls the drop pod's launch system."
icon = 'icons/obj/terminals.dmi'
icon_state = "dorm_available"
icon_keyboard = null
light_color = LIGHT_COLOR_BLUE
req_access = list(ACCESS_SYNDICATE)
shuttleId = "steel_rain"