cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Moves screen objects from mob to hud (#1336)

Browse Source 
* Moves screen objects from mob to hud (#54400)

This moves screen images from icons/mob to icons/hud
Makes more sense and it is easier to find

* Moves screen objects from mob to hud

* Update radial.dm

Co-authored-by: nicbn <nicolas.nattis@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
This commit is contained in:
SkyratBot
2020-10-16 03:37:54 +02:00
committed by GitHub
co-authored by nicbn Azarak
parent d80c0b303b
commit 28472fa8f3
68 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/bump_teleporter.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/effect/bump_teleporter
name = "bump-teleporter"
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "x2"
var/id = null //id of this bump_teleporter.
var/id_target = null //id of bump_teleporter which this moves you to.
code/game/objects/effects/decals/misc.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/effect/temp_visual/point
name = "pointer"
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "arrow"
layer = POINT_LAYER
duration = 25
code/game/objects/effects/spawners/bombspawner.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/effect/spawner/newbomb
name = "bomb"
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "x"
var/temp_p = 1500
var/temp_o = 1000 // tank temperatures
code/game/objects/effects/spawners/bundle.dm
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/effect/spawner/bundle
name = "bundle spawner"
icon = 'icons/mob/screen_gen.dmi'
icon = 'icons/hud/screen_gen.dmi'
icon_state = "x2"
color = "#00FF00"
code/game/objects/items/RCD.dm
+22 -22
View File
@@ -308,10 +308,10 @@ RLD
if(!user)
return
var/list/computer_dirs = list(
"NORTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "cnorth"),
"EAST" = image(icon = 'icons/mob/radial.dmi', icon_state = "ceast"),
"SOUTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "csouth"),
"WEST" = image(icon = 'icons/mob/radial.dmi', icon_state = "cwest")
"NORTH" = image(icon = 'icons/hud/radial.dmi', icon_state = "cnorth"),
"EAST" = image(icon = 'icons/hud/radial.dmi', icon_state = "ceast"),
"SOUTH" = image(icon = 'icons/hud/radial.dmi', icon_state = "csouth"),
"WEST" = image(icon = 'icons/hud/radial.dmi', icon_state = "cwest")
)
var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
@@ -333,8 +333,8 @@ RLD
var/list/solid_or_glass_choices = list(
"Solid" = get_airlock_image(/obj/machinery/door/airlock),
"Glass" = get_airlock_image(/obj/machinery/door/airlock/glass),
"Windoor" = image(icon = 'icons/mob/radial.dmi', icon_state = "windoor"),
"Secure Windoor" = image(icon = 'icons/mob/radial.dmi', icon_state = "secure_windoor")
"Windoor" = image(icon = 'icons/hud/radial.dmi', icon_state = "windoor"),
"Secure Windoor" = image(icon = 'icons/hud/radial.dmi', icon_state = "secure_windoor")
)
var/list/solid_choices = list(
@@ -470,10 +470,10 @@ RLD
if(!user)
return
var/static/list/choices = list(
"Chair" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair"),
"Stool" = image(icon = 'icons/mob/radial.dmi', icon_state = "stool"),
"Table" = image(icon = 'icons/mob/radial.dmi', icon_state = "table"),
"Glass Table" = image(icon = 'icons/mob/radial.dmi', icon_state = "glass_table")
"Chair" = image(icon = 'icons/hud/radial.dmi', icon_state = "chair"),
"Stool" = image(icon = 'icons/hud/radial.dmi', icon_state = "stool"),
"Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "table"),
"Glass Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "glass_table")
)
var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
@@ -528,15 +528,15 @@ RLD
/obj/item/construction/rcd/attack_self(mob/user)
..()
var/list/choices = list(
"Airlock" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlock"),
"Deconstruct" = image(icon= 'icons/mob/radial.dmi', icon_state = "delete"),
"Grilles & Windows" = image(icon = 'icons/mob/radial.dmi', icon_state = "grillewindow"),
"Floors & Walls" = image(icon = 'icons/mob/radial.dmi', icon_state = "wallfloor")
"Airlock" = image(icon = 'icons/hud/radial.dmi', icon_state = "airlock"),
"Deconstruct" = image(icon= 'icons/hud/radial.dmi', icon_state = "delete"),
"Grilles & Windows" = image(icon = 'icons/hud/radial.dmi', icon_state = "grillewindow"),
"Floors & Walls" = image(icon = 'icons/hud/radial.dmi', icon_state = "wallfloor")
)
if(upgrade & RCD_UPGRADE_FRAMES)
choices += list(
"Machine Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "machine"),
"Computer Frames" = image(icon = 'icons/mob/radial.dmi', icon_state = "computer_dir"),
"Machine Frames" = image(icon = 'icons/hud/radial.dmi', icon_state = "machine"),
"Computer Frames" = image(icon = 'icons/hud/radial.dmi', icon_state = "computer_dir"),
)
if(upgrade & RCD_UPGRADE_SILO_LINK)
choices += list(
@@ -544,21 +544,21 @@ RLD
)
if(upgrade & RCD_UPGRADE_FURNISHING)
choices += list(
"Furnishing" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair")
"Furnishing" = image(icon = 'icons/hud/radial.dmi', icon_state = "chair")
)
if(mode == RCD_AIRLOCK)
choices += list(
"Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"),
"Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype")
"Change Access" = image(icon = 'icons/hud/radial.dmi', icon_state = "access"),
"Change Airlock Type" = image(icon = 'icons/hud/radial.dmi', icon_state = "airlocktype")
)
else if(mode == RCD_WINDOWGRILLE)
choices += list(
"Change Window Glass" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype"),
"Change Window Size" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowsize")
"Change Window Glass" = image(icon = 'icons/hud/radial.dmi', icon_state = "windowtype"),
"Change Window Size" = image(icon = 'icons/hud/radial.dmi', icon_state = "windowsize")
)
else if(mode == RCD_FURNISHING)
choices += list(
"Change Furnishing Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "chair")
"Change Furnishing Type" = image(icon = 'icons/hud/radial.dmi', icon_state = "chair")
)
var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
code/game/objects/items/RCL.dm
+1 -1
View File
@@ -246,7 +246,7 @@
var/pipe_cleanersuffix = "[min(fromdir,dirnum)]-[max(fromdir,dirnum)]"
if(fromdir == dirnum) //pipe_cleaners can't loop back on themselves
pipe_cleanersuffix = "invalid"
var/image/img = image(icon = 'icons/mob/radial.dmi', icon_state = "cable_[pipe_cleanersuffix]")
var/image/img = image(icon = 'icons/hud/radial.dmi', icon_state = "cable_[pipe_cleanersuffix]")
img.color = GLOB.pipe_cleaner_colors[colors[current_color_index]]
wiredirs[icondir] = img
return wiredirs
code/game/objects/items/tcg/tcg.dm
+10 -10
View File
@@ -55,9 +55,9 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
var/list/choices = GLOB.tcgcard_radial_choices
if(!length(choices))
choices = GLOB.tcgcard_radial_choices = list(
"Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
"Tap" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_tap"),
"Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip"),
"Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"),
"Tap" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_tap"),
"Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"),
)
var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))
@@ -171,9 +171,9 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
icon_state = "deck_up"
obj_flags = UNIQUE_RENAME
var/flipped = FALSE
var/static/radial_draw = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw")
var/static/radial_shuffle = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle")
var/static/radial_pickup = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup")
var/static/radial_draw = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw")
var/static/radial_shuffle = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle")
var/static/radial_pickup = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup")
/obj/item/tcgcard_deck/Initialize()
. = ..()
@@ -198,10 +198,10 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
/obj/item/tcgcard_deck/attack_hand(mob/user)
var/list/choices = list(
"Draw" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw"),
"Shuffle" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle"),
"Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
"Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip"),
"Draw" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_draw"),
"Shuffle" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_shuffle"),
"Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"),
"Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"),
)
var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
if(!check_menu(user))