Skip to content

Commit

Permalink
Changes the missing food icon test to cover ALL /obj's (tgstation#71908)
Browse files Browse the repository at this point in the history
Might as well cover everyyyyyyyyything. :)

Fixes tgstation#71953
Fixes tgstation#71983

🆑 ShizCalev
code: We now unit test all /obj's for missing icons. :)
/🆑


todo: Fix the fucked up icons.

Co-authored-by: MrMelbert <[email protected]>
  • Loading branch information
ShizCalev and MrMelbert authored Dec 14, 2022
1 parent d564518 commit ae8ed39
Show file tree
Hide file tree
Showing 94 changed files with 189 additions and 177 deletions.
2 changes: 1 addition & 1 deletion code/game/machinery/doors/door.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/machinery/door
name = "door"
desc = "It opens and closes."
icon = 'icons/obj/doors/Doorint.dmi'
icon = 'icons/obj/doors/doorint.dmi'
icon_state = "door1"
base_icon_state = "door"
opacity = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/effect/spresent
name = "strange present"
desc = "It's a ... present?"
icon = 'icons/obj/weapons/items_and_weapons.dmi'
icon = 'icons/obj/storage/wrapping.dmi'
icon_state = "strangepresent"
density = TRUE
anchored = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/effects/powerup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@
/obj/effect/powerup/health/full
name = "mega health pickup"
desc = "Now this is what I'm talking about."
icon_state = "duffel-med"
icon_state = "duffel-medical"
full_heal = TRUE

/obj/effect/powerup/ammo
name = "ammo pickup"
desc = "You like revenge, right? Everybody likes revenge! Well, let's go get some!"
icon = 'icons/obj/storage/box.dmi'
icon = 'icons/obj/storage/toolbox.dmi'
icon_state = "ammobox"
respawn_time = 30 SECONDS
pickup_message = "Ammunition reloaded!"
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/effects/temporary_visuals/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,14 @@
fades = TRUE

/obj/effect/temp_visual/dir_setting/curse/hand
icon_state = "cursehand"
icon_state = "cursehand1"


/obj/effect/temp_visual/bsa_splash
name = "\improper Bluespace energy wave"
desc = "A massive, rippling wave of bluepace energy, all rapidly exhausting itself the moment it leaves the concentrated beam of light."
icon = 'icons/effects/beam_splash.dmi'
icon_state = "beam_splash_l"
icon_state = "beam_splash_e"
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
pixel_y = -16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
icon_state = "muzzle_laser"

/obj/effect/projectile/muzzle/laser/blue
icon_state = "muzzle_laser_blue"
icon_state = "muzzle_blue"

/obj/effect/projectile/muzzle/disabler
icon_state = "muzzle_omni"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -801,8 +801,6 @@
/obj/item/stack/sheet/glass = 2)

/obj/item/circuitboard/machine/sleeper/fullupgrade
name = "Sleeper"
icon_state = "medical"
build_path = /obj/machinery/sleeper/syndie/fullupgrade
req_components = list(
/obj/item/stock_parts/matter_bin/bluespace = 1,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/taperecorder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -468,4 +468,4 @@
. = ..()

/obj/item/tape/dyed
icon_state = "greyscale"
icon_state = "tape_greyscale"
2 changes: 1 addition & 1 deletion code/game/objects/items/implants/implant.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name = "implant"
icon = 'icons/obj/implants.dmi'
icon_state = "generic" //Shows up as the action button icon
item_flags = DROPDEL
item_flags = ABSTRACT | DROPDEL
resistance_flags = INDESTRUCTIBLE
// This gives the user an action button that allows them to activate the implant.
// If the implant needs no action button, then null this out.
Expand Down
7 changes: 4 additions & 3 deletions code/game/objects/items/religion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
/obj/item/storage/backpack/bannerpack
name = "\improper Nanotrasen banner backpack"
desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed."
icon_state = "bannerpack"
icon_state = "backpack-banner"

/obj/item/storage/backpack/bannerpack/Initialize(mapload)
. = ..()
Expand All @@ -259,18 +259,19 @@
/obj/item/storage/backpack/bannerpack/red
name = "red banner backpack"
desc = "It's a backpack with lots of extra room. A red banner is attached, that can't be removed."
icon_state = "bannerpack-red"
icon_state = "backpack-banner_red"

/obj/item/storage/backpack/bannerpack/blue
name = "blue banner backpack"
desc = "It's a backpack with lots of extra room. A blue banner is attached, that can't be removed."
icon_state = "bannerpack-blue"
icon_state = "backpack-banner_blue"

//this is all part of one item set

/obj/item/clothing/head/helmet/plate/crusader
name = "Crusader's Hood"
desc = "A brownish hood."
icon = 'icons/obj/clothing/head/chaplain.dmi'
icon_state = "crusader"
inhand_icon_state = null
w_class = WEIGHT_CLASS_NORMAL
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/robot/items/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
name = "\improper Hyperkinetic Dampening projector"
desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. <span class='boldnotice'>Projects a field that drains power per second while active, that will weaken and slow damaging projectiles inside its field.</span> Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
icon = 'icons/obj/device.dmi'
icon_state = "shield"
icon_state = "shield0"
base_icon_state = "shield"
/// Max energy this dampener can hold
var/maxenergy = 1500
/// Current energy level
Expand Down Expand Up @@ -57,7 +58,6 @@
/obj/item/borg/projectile_dampen/Initialize(mapload)
projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect")
tracked = list()
icon_state = "shield0"
START_PROCESSING(SSfastprocess, src)
host = loc
RegisterSignal(host, COMSIG_LIVING_DEATH, PROC_REF(on_death))
Expand Down Expand Up @@ -88,7 +88,7 @@
to_chat(user, span_boldnotice("You [active ? "activate":"deactivate"] [src]."))

/obj/item/borg/projectile_dampen/update_icon_state()
icon_state = "[initial(icon_state)][active]"
icon_state = "[base_icon_state][active]"
return ..()

/obj/item/borg/projectile_dampen/proc/activate_field()
Expand Down
2 changes: 0 additions & 2 deletions code/game/objects/items/storage/fancy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

/obj/item/storage/fancy
icon = 'icons/obj/food/containers.dmi'
icon_state = "donutbox"
base_icon_state = "donutbox"
resistance_flags = FLAMMABLE
custom_materials = list(/datum/material/cardboard = 2000)
/// Used by examine to report what this thing is holding.
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tcg/tcg.dm
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
name = "Trading Card Pack: Coder"
desc = "Contains six complete fuckups by the coders. Report this on github please!"
icon = 'icons/obj/toys/tcgmisc.dmi'
icon_state = "cardback_nt"
icon_state = "error"
w_class = WEIGHT_CLASS_TINY
custom_price = PAYCHECK_CREW * 2 //Effectively expensive as long as you're not a very high paying job... in which case, why are you playing trading card games?
///The card series to look in
Expand Down
3 changes: 1 addition & 2 deletions code/game/objects/items/weaponry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/staff
name = "wizard staff"
desc = "Apparently a staff used by the wizard."
icon = 'icons/obj/wizard.dmi'
icon = 'icons/obj/weapons/guns/magic.dmi'
icon_state = "staff"
inhand_icon_state = "staff"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
Expand All @@ -521,7 +521,6 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
inhand_icon_state = "broom"
resistance_flags = FLAMMABLE
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/structures/aliens.dm
Original file line number Diff line number Diff line change
Expand Up @@ -329,8 +329,8 @@
/obj/structure/alien/egg
name = "egg"
desc = "A large mottled egg."
var/base_icon = "egg"
icon_state = "egg_growing"
base_icon_state = "egg"
density = FALSE
anchored = TRUE
max_integrity = 100
Expand Down Expand Up @@ -358,11 +358,11 @@
/obj/structure/alien/egg/update_icon_state()
switch(status)
if(GROWING)
icon_state = "[base_icon]_growing"
icon_state = "[base_icon_state]_growing"
if(GROWN)
icon_state = "[base_icon]"
icon_state = "[base_icon_state]"
if(BURST)
icon_state = "[base_icon]_hatched"
icon_state = "[base_icon_state]_hatched"
return ..()

/obj/structure/alien/egg/attack_paw(mob/living/user, list/modifiers)
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/structures/beds_chairs/sofa.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ path/corner/color_name {\

/obj/structure/chair/sofa
name = "old ratty sofa"
icon_state = "error"
icon = 'icons/obj/sofa.dmi'
buildstackamount = 1
item_chair = null
Expand Down
1 change: 0 additions & 1 deletion code/game/objects/structures/false_walls.dm
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@
name = "bamboo wall"
desc = "A wall with bamboo finish. Zen."
icon = 'icons/turf/walls/bamboo_wall.dmi'
icon_state = "bamboo"
mineral = /obj/item/stack/sheet/mineral/bamboo
walltype = /turf/closed/wall/mineral/bamboo
smoothing_flags = SMOOTH_BITMASK
Expand Down
5 changes: 4 additions & 1 deletion code/game/objects/structures/fluff.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
name = "bus"
desc = "GO TO SCHOOL. READ A BOOK."
icon = 'icons/obj/bus.dmi'
icon_state = null
density = TRUE
anchored = TRUE
deconstructible = FALSE
Expand Down Expand Up @@ -145,6 +146,7 @@
/obj/structure/fluff/divine
name = "Miracle"
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = "error"
anchored = TRUE
density = TRUE

Expand Down Expand Up @@ -201,7 +203,7 @@
/obj/structure/fluff/beach_towel
name = "beach towel"
desc = "A towel decorated in various beach-themed designs."
icon = 'icons/obj/fluff.dmi'
icon = 'icons/obj/railings.dmi'
icon_state = "railing"
density = FALSE
anchored = TRUE
Expand Down Expand Up @@ -234,6 +236,7 @@
/obj/structure/fluff/clockwork
name = "Clockwork Fluff"
icon = 'icons/obj/fluff.dmi'
icon_state = "error"
deconstructible = FALSE

/obj/structure/fluff/clockwork/alloy_shards
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/mystery_box.dm
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list(
name = "???"
desc = "Who knows what it'll be??"
icon = 'icons/obj/weapons/guns/ballistic.dmi'
icon_state = "detective"
icon_state = "revolver"
pixel_y = -8
uses_integrity = FALSE

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@
name = "titanium glass table"
desc = "A titanium reinforced glass table, with a fresh coat of NT white paint."
icon = 'icons/obj/smooth_structures/titaniumglass_table.dmi'
icon_state = "titaniumglass_table-o"
icon_state = "titaniumglass_table-0"
base_icon_state = "titaniumglass_table"
custom_materials = list(/datum/material/alloy/titaniumglass = 2000)
buildstack = /obj/item/stack/sheet/titaniumglass
Expand Down
24 changes: 12 additions & 12 deletions code/game/objects/structures/transit_tubes/station.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/obj/structure/transit_tube/station
name = "station tube station"
icon_state = "closed_station0"
base_icon_state = "station0"
desc = "The lynchpin of the transit system."
exit_delay = 1
enter_delay = 2
Expand All @@ -18,7 +19,6 @@
var/cooldown_delay = 50
var/launch_cooldown = 0
var/reverse_launch = FALSE
var/base_icon = "station0"
var/boarding_dir //from which direction you can board the tube

/obj/structure/transit_tube/station/Initialize(mapload)
Expand Down Expand Up @@ -106,14 +106,14 @@

/obj/structure/transit_tube/station/proc/open_animation()
if(open_status == STATION_TUBE_CLOSED)
icon_state = "opening_[base_icon]"
icon_state = "opening_[base_icon_state]"
open_status = STATION_TUBE_OPENING
addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION)

/obj/structure/transit_tube/station/proc/finish_animation()
switch(open_status)
if(STATION_TUBE_OPENING)
icon_state = "open_[base_icon]"
icon_state = "open_[base_icon_state]"
open_status = STATION_TUBE_OPEN
for(var/obj/structure/transit_tube_pod/pod in loc)
for(var/thing in pod)
Expand All @@ -124,12 +124,12 @@
var/atom/movable/movable_content = thing
movable_content.forceMove(loc) //Everything else is moved out of.
if(STATION_TUBE_CLOSING)
icon_state = "closed_[base_icon]"
icon_state = "closed_[base_icon_state]"
open_status = STATION_TUBE_CLOSED

/obj/structure/transit_tube/station/proc/close_animation()
if(open_status == STATION_TUBE_OPEN)
icon_state = "closing_[base_icon]"
icon_state = "closing_[base_icon_state]"
open_status = STATION_TUBE_CLOSING
addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION)

Expand Down Expand Up @@ -187,7 +187,7 @@

/obj/structure/transit_tube/station/flipped
icon_state = "closed_station1"
base_icon = "station1"
base_icon_state = "station1"
tube_construction = /obj/structure/c_transit_tube/station/flipped

/obj/structure/transit_tube/station/flipped/init_tube_dirs()
Expand All @@ -200,7 +200,7 @@
tube_construction = /obj/structure/c_transit_tube/station/reverse
reverse_launch = TRUE
icon_state = "closed_terminus0"
base_icon = "terminus0"
base_icon_state = "terminus0"

/obj/structure/transit_tube/station/reverse/init_tube_dirs()
switch(dir)
Expand All @@ -216,7 +216,7 @@

/obj/structure/transit_tube/station/reverse/flipped
icon_state = "closed_terminus1"
base_icon = "terminus1"
base_icon_state = "terminus1"
tube_construction = /obj/structure/c_transit_tube/station/reverse/flipped

/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs()
Expand All @@ -231,7 +231,7 @@
desc = "The lynchpin of a GOOD transit system."
enter_delay = 1
tube_construction = /obj/structure/c_transit_tube/station/dispenser
base_icon = "dispenser0"
base_icon_state = "dispenser0"
open_status = STATION_TUBE_OPEN

/obj/structure/transit_tube/station/dispenser/close_animation()
Expand Down Expand Up @@ -267,7 +267,7 @@

/obj/structure/transit_tube/station/dispenser/flipped
icon_state = "open_dispenser1"
base_icon = "dispenser1"
base_icon_state = "dispenser1"
tube_construction = /obj/structure/c_transit_tube/station/dispenser/flipped

/obj/structure/transit_tube/station/dispenser/flipped/init_tube_dirs()
Expand All @@ -279,7 +279,7 @@
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse
reverse_launch = TRUE
icon_state = "open_terminusdispenser0"
base_icon = "terminusdispenser0"
base_icon_state = "terminusdispenser0"

/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs()
switch(dir)
Expand All @@ -295,7 +295,7 @@

/obj/structure/transit_tube/station/dispenser/reverse/flipped
icon_state = "open_terminusdispenser1"
base_icon = "terminusdispenser1"
base_icon_state = "terminusdispenser1"
tube_construction = /obj/structure/c_transit_tube/station/dispenser/reverse/flipped

/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs()
Expand Down
Loading

0 comments on commit ae8ed39

Please sign in to comment.