Merge remote-tracking branch 'upstream/master' into skeleton-ghost-role

BeeStation · Sep 20, 2024 · afcad91 · afcad91
2 parents 2e13f82 + ddfa5e9
commit afcad91
Show file tree

Hide file tree

Showing 217 changed files with 20,111 additions and 20,035 deletions.
diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm
diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -457,7 +457,7 @@
 	transform = M
 
 /atom/movable/screen/click_catcher
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	icon_state = "catcher"
 	plane = CLICKCATCHER_PLANE
 	mouse_opacity = MOUSE_OPACITY_OPAQUE
@@ -467,7 +467,7 @@
 #define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32)			//Not using world.icon_size on purpose.
 
 /atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15)
-	var/icon/newicon = icon('icons/mob/screen_gen.dmi', "catcher")
+	var/icon/newicon = icon('icons/hud/screen_gen.dmi', "catcher")
 	var/ox = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_x)
 	var/oy = min(MAX_SAFE_BYOND_ICON_SCALE_TILES, view_size_y)
 	var/px = view_size_x * world.icon_size

diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
@@ -71,10 +71,10 @@
 /atom/movable/screen/movable/action_button/hide_toggle
 	name = "Hide Buttons"
 	desc = "Shift-click any button to reset its position, and Control-click it to lock it in place. Alt-click this button to reset all buttons to their default positions."
-	icon = 'icons/mob/actions.dmi'
+	icon = 'icons/hud/actions/action_generic.dmi'
 	icon_state = "bg_default"
 	var/hidden = FALSE
-	var/hide_icon = 'icons/mob/actions.dmi'
+	var/hide_icon = 'icons/hud/actions/action_generic.dmi'
 	var/hide_state = "hide"
 	var/show_state = "show"
 	var/mutable_appearance/hide_appearance
@@ -176,7 +176,7 @@
 	.["bg_state"] = "template"
 
 	//TODO : Make these fit theme
-	.["toggle_icon"] = 'icons/mob/actions.dmi'
+	.["toggle_icon"] = 'icons/hud/actions/action_generic.dmi'
 	.["toggle_hide"] = "hide"
 	.["toggle_show"] = "show"
 

diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
@@ -1,5 +1,5 @@
 /atom/movable/screen/ai
-	icon = 'icons/mob/screen_ai.dmi'
+	icon = 'icons/hud/screen_ai.dmi'
 
 /atom/movable/screen/ai/Click()
 	if(isobserver(usr) || usr.incapacitated())
@@ -201,7 +201,7 @@
 	upwards = FALSE
 
 /datum/hud/ai
-	ui_style = 'icons/mob/screen_ai.dmi'
+	ui_style = 'icons/hud/screen_ai.dmi'
 
 /datum/hud/ai/New(mob/owner)
 	..()

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
@@ -88,7 +88,7 @@
 	qdel(alert)
 
 /atom/movable/screen/alert
-	icon = 'icons/mob/screen_alert.dmi'
+	icon = 'icons/hud/screen_alert.dmi'
 	icon_state = "default"
 	name = "Alert"
 	desc = "Something seems to have gone wrong with this alert, so report this bug please"
@@ -388,7 +388,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 
 /atom/movable/screen/alert/bloodsense/Initialize(mapload)
 	. = ..()
-	narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
+	narnar = new('icons/hud/screen_alert.dmi', "mini_nar")
 	START_PROCESSING(SSprocessing, src)
 
 /atom/movable/screen/alert/bloodsense/Destroy()

diff --git a/code/_onclick/hud/alien.dm b/code/_onclick/hud/alien.dm
@@ -1,5 +1,5 @@
 /atom/movable/screen/alien
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 
 /atom/movable/screen/alien/leap
 	name = "toggle leap"
@@ -11,21 +11,21 @@
 		AH.toggle_leap()
 
 /atom/movable/screen/alien/plasma_display
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	icon_state = "power_display2"
 	name = "plasma stored"
 	screen_loc = ui_alienplasmadisplay
 
 
 /atom/movable/screen/alien/alien_queen_finder
-	icon = 'icons/mob/screen_alien.dmi'
+	icon = 'icons/hud/screen_alien.dmi'
 	icon_state = "queen_finder"
 	name = "queen sense"
 	desc = "Allows you to sense the general direction of your Queen."
 	screen_loc = ui_alien_queen_finder
 
 /datum/hud/alien
-	ui_style = 'icons/mob/screen_alien.dmi'
+	ui_style = 'icons/hud/screen_alien.dmi'
 
 /datum/hud/alien/New(mob/living/carbon/alien/humanoid/owner)
 	..()

diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
@@ -1,5 +1,5 @@
 /datum/hud/larva
-	ui_style = 'icons/mob/screen_alien.dmi'
+	ui_style = 'icons/hud/screen_alien.dmi'
 
 /datum/hud/larva/New(mob/owner)
 	..()
@@ -20,7 +20,7 @@
 	infodisplay += alien_queen_finder
 
 	pull_icon = new /atom/movable/screen/pull()
-	pull_icon.icon = 'icons/mob/screen_alien.dmi'
+	pull_icon.icon = 'icons/hud/screen_alien.dmi'
 	pull_icon.update_icon()
 	pull_icon.screen_loc = ui_above_movement
 	pull_icon.hud = src

diff --git a/code/_onclick/hud/blob_overmind.dm b/code/_onclick/hud/blob_overmind.dm
@@ -1,6 +1,6 @@
 
 /atom/movable/screen/blob
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/hud/actions/actions_blob.dmi'
 
 /atom/movable/screen/blob/MouseEntered(location,control,params)
 	openToolTip(usr,src,params,title = name,content = desc, theme = "blob")

diff --git a/code/_onclick/hud/constructs.dm b/code/_onclick/hud/constructs.dm
@@ -1,5 +1,5 @@
 /datum/hud/constructs
-	ui_style = 'icons/mob/screen_construct.dmi'
+	ui_style = 'icons/hud/screen_construct.dmi'
 
 /datum/hud/constructs/New(mob/owner)
 	..()

diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
@@ -60,7 +60,7 @@
 				client.screen -= screen
 
 /atom/movable/screen/fullscreen
-	icon = 'icons/mob/screen_full.dmi'
+	icon = 'icons/hud/fullscreen/screen_full.dmi'
 	icon_state = "default"
 	screen_loc = "CENTER-7,CENTER-7"
 	layer = FULLSCREEN_LAYER
@@ -134,27 +134,27 @@
 	icon_state = "impairedoverlay"
 
 /atom/movable/screen/fullscreen/flash
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "flash"
 
 /atom/movable/screen/fullscreen/flash/black
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "black"
 
 /atom/movable/screen/fullscreen/flash/static
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "noise"
 
 /atom/movable/screen/fullscreen/high
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "druggy"
 
 /atom/movable/screen/fullscreen/color_vision
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
 	icon_state = "flash"
 	alpha = 80
@@ -169,7 +169,7 @@
 	color = "#0000ff"
 
 /atom/movable/screen/fullscreen/lighting_backdrop
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/hud/screen_gen.dmi'
 	icon_state = "flash"
 	transform = matrix(200, 0, 0, 0, 200, 0)
 	plane = LIGHTING_PLANE
@@ -195,6 +195,7 @@
 	show_when_dead = TRUE
 
 /atom/movable/screen/fullscreen/see_through_darkness
+	invisibility = INVISIBILITY_LIGHTING
 	icon_state = "nightvision"
 	plane = LIGHTING_PLANE
 	blend_mode = BLEND_ADD
@@ -215,7 +216,7 @@
 
 /atom/movable/screen/fullscreen/blind_context_disable/Initialize(mapload)
 	. = ..()
-	var/icon/mask = icon('icons/mob/psychic.dmi', "click_mask")
+	var/icon/mask = icon('icons/hud/fullscreen/psychic.dmi', "click_mask")
 	add_filter("click_mask", 1, alpha_mask_filter(icon = mask, flags = MASK_INVERSE))
 
 /atom/movable/screen/fullscreen/blind_context_disable/Destroy()

diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
@@ -1,5 +1,5 @@
 /atom/movable/screen/ghost
-	icon = 'icons/mob/screen_ghost.dmi'
+	icon = 'icons/hud/screen_ghost.dmi'
 
 /atom/movable/screen/ghost/MouseEntered()
 	flick(icon_state + "_anim", src)