Skip to content

Commit

Permalink
Removes Redundant Borg UI Icon Override (#164)
Browse files Browse the repository at this point in the history
* move cargoborg UI icon to expected file, remove borgUI override

the only different icon in here was the cargo one. we missed a scrollbar UI icon because of this override

* delete the empty _onclidk/hud folder and its readme

Is this readme even relevant? It's a ""list"" of a single hud that's isolated to its own module. Said module has its own readme.

* oh i should probably untick this

* specify :)

* should probably delete the now unused icon file too
  • Loading branch information
OrionTheFox authored and Iajret committed Jan 3, 2024
1 parent aa0d2f3 commit ff83330
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 8 deletions.
4 changes: 0 additions & 4 deletions modular_nova/master_files/code/_onclick/hud/readme.md

This file was deleted.

2 changes: 0 additions & 2 deletions modular_nova/master_files/code/_onclick/hud/screen_objects.dm

This file was deleted.

Binary file not shown.
5 changes: 4 additions & 1 deletion modular_nova/modules/borgs/code/robot_model.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
var/icon/cyborg_icon_override
var/sleeper_overlay
var/cyborg_pixel_offset
/// Alternate icon file used for this module's collapsed UI icon
var/model_select_alternate_icon
/// Traits unique to this model, i.e. having a unique dead sprite, being wide or being small enough to reject shrinker modules. Leverages defines in code\__DEFINES\~skyrat_defines\robot_defines.dm
/// If a sprite overlaps above the standard height, ensure it is not overlapping icons in the selector wheel.
Expand Down Expand Up @@ -194,6 +195,7 @@
"NiKO" = list(SKIN_ICON_STATE = "mmekaeng", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
)

//JANITOR
/obj/item/robot_model/janitor
borg_skins = list(
/// 32x32 Skins
Expand Down Expand Up @@ -292,6 +294,7 @@
"NiKO" = list(SKIN_ICON_STATE = "mmekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
)

//SECURITY
/obj/item/robot_model/security
borg_skins = list(
/// 32x32 Skins
Expand Down Expand Up @@ -353,6 +356,7 @@
hat_offset = 0
cyborg_base_icon = "cargo"
model_select_icon = "cargo"
model_select_alternate_icon = 'modular_nova/modules/borgs/icons/screen_cyborg.dmi'
canDispose = TRUE
borg_skins = list(
/// 32x32 Skins
Expand All @@ -374,7 +378,6 @@
"NiKO" = list(SKIN_ICON_STATE = "mmekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
)


//SYNDICATE
/obj/item/robot_model/syndicatejack
name = "Syndicate"
Expand Down
Binary file modified modular_nova/modules/borgs/icons/screen_cyborg.dmi
Binary file not shown.
1 change: 0 additions & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -6138,7 +6138,6 @@
#include "modular_nova\master_files\code\_globalvars\lists\ambience.dm"
#include "modular_nova\master_files\code\_globalvars\lists\chat.dm"
#include "modular_nova\master_files\code\_onclick\cyborg.dm"
#include "modular_nova\master_files\code\_onclick\hud\screen_objects.dm"
#include "modular_nova\master_files\code\controllers\configuration\entries\skyrat_config_entries.dm"
#include "modular_nova\master_files\code\controllers\subsystem\dbcore.dm"
#include "modular_nova\master_files\code\controllers\subsystem\events.dm"
Expand Down

0 comments on commit ff83330

Please sign in to comment.