Merge pull request #16861 from Drulikar/fix_minimap_renderer

Nanomap Rendering Fixes & Linting
This commit is contained in:
Cameron Lennox
2025-01-14 15:01:08 -05:00
committed by GitHub
52 changed files with 341 additions and 364 deletions
@@ -22,10 +22,11 @@ var/list/marker_beacon_colors = list(
description_info = "Use inhand to drop one marker beacon. You can pick them up again with an empty hand or \
hitting them with this marker stack. Alt-click to select a specific color."
icon = 'icons/obj/lighting.dmi'
icon_state = "marker"
icon_state = "markerrandom"
max_amount = 100
no_variants = TRUE
w_class = ITEMSIZE_SMALL
var/icon_base = "marker"
var/picked_color = "random"
/obj/item/stack/marker_beacon/ten
@@ -47,7 +48,7 @@ var/list/marker_beacon_colors = list(
. += span_notice("Alt-click to select a color. Current color is [picked_color].")
/obj/item/stack/marker_beacon/update_icon()
icon_state = "[initial(icon_state)][lowertext(picked_color)]"
icon_state = "[icon_base][lowertext(picked_color)]"
/obj/item/stack/marker_beacon/attack_self(mob/user)
if(!isturf(user.loc))
@@ -79,11 +80,12 @@ var/list/marker_beacon_colors = list(
name = "marker beacon"
desc = "A prismatic path illumination device. It is anchored in place and glowing steadily."
icon = 'icons/obj/lighting.dmi'
icon_state = "marker"
icon_state = "markerrandom"
// layer = BELOW_OPEN_DOOR_LAYER
anchored = TRUE
light_range = 2
light_power = 0.8
var/icon_base = "marker"
var/remove_speed = 15
var/picked_color
var/perma = FALSE
@@ -105,7 +107,7 @@ var/list/marker_beacon_colors = list(
/obj/structure/marker_beacon/update_icon()
if(!picked_color || !marker_beacon_colors[picked_color])
picked_color = pick(marker_beacon_colors)
icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
icon_state = "[icon_base][lowertext(picked_color)]-on"
set_light(light_range, light_power, marker_beacon_colors[picked_color])
/obj/structure/marker_beacon/attack_hand(mob/living/user)
@@ -32,6 +32,7 @@ var/list/tape_roll_applications = list()
/obj/item/tape
name = "tape"
icon = 'icons/policetape.dmi'
icon_state = "tape"
anchored = TRUE
layer = WINDOW_LAYER
var/lifted = 0
+1 -1
View File
@@ -163,7 +163,7 @@
/obj/random/tech_supply/component
name = "random tech component"
desc = "This is a random machine component."
icon_state = "tech"
icon_state = "random_device"
/obj/random/tech_supply/component/item_to_spawn()
return pick(prob(3);/obj/item/stock_parts/gear,
+1 -1
View File
@@ -2,7 +2,7 @@
desc = "The current barsign of this shift! The bartender can change it with their ID."
icon = 'icons/obj/barsigns.dmi'
plane = ABOVE_PLANE
icon_state = "empty"
icon_state = "Empty"
appearance_flags = 0
anchored = TRUE
var/cult = 0
@@ -3,7 +3,7 @@
desc = "It's a burial receptacle for the dearly departed."
icon = 'icons/obj/closets/coffin.dmi'
icon_state = "closed_unlocked"
icon_state = "closed"
seal_tool = /obj/item/tool/screwdriver
breakout_sound = 'sound/weapons/tablehit1.ogg'
closet_appearance = null // Special icon for us
@@ -13,7 +13,7 @@
name = "grave"
desc = "Dirt."
icon = 'icons/obj/closets/grave.dmi'
icon_state = "closed_unlocked"
icon_state = ""
seal_tool = null
breakout_sound = 'sound/weapons/thudswoosh.ogg'
anchored = TRUE
@@ -20,6 +20,7 @@
/obj/structure/closet/secure_closet/freezer/meat
name = "meat fridge"
icon = 'icons/obj/closets/fridge.dmi'
icon_state = ""
closet_appearance = null
starts_with = list(
@@ -29,6 +30,7 @@
/obj/structure/closet/secure_closet/freezer/fridge
name = "refrigerator"
icon = 'icons/obj/closets/fridge.dmi'
icon_state = ""
closet_appearance = null
starts_with = list(
@@ -41,6 +43,7 @@
/obj/structure/closet/secure_closet/freezer/money
name = "freezer"
icon = 'icons/obj/closets/fridge.dmi'
icon_state = ""
closet_appearance = null
req_access = list(access_heads_vault)
@@ -372,6 +372,7 @@
desc = "A large bin."
closet_appearance = null
icon = 'icons/obj/closets/largebin.dmi'
icon_state = ""
/obj/structure/closet/crate/radiation
name = "radioactive gear crate"