[IDB IGNORE] The End. (Deatomizes everything) (#1464)

* Oblivion -destroys whitesands folder and everything in it. * I said THE END GO HOME WHITESANDS. IT'S OVER. * this one's on me whoopsies * again * a retlaw why * gain a * a I sure wish I thought to do this earlier
shiptest-ss13 · Aug 18, 2022 · 0d2dc39 · 0d2dc39
1 parent 6e65bfd
commit 0d2dc39
Show file tree

Hide file tree

Showing 345 changed files with 491 additions and 653 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -511,7 +511,7 @@
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/icemoon/surface/outdoors)
 "OF" = (
-/obj/structure/flora/ash/whitesands/fireblossom,
+/obj/structure/flora/ash/fireblossom,
 /obj/structure/stone_tile/cracked{
 	dir = 4
 	},

diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_icecropolis.dmm
@@ -2409,8 +2409,8 @@
 /area/ruin/unpowered/icecropolis/rusty)
 "RQ" = (
 /obj/structure/table/wood/reinforced,
-/obj/item/seeds/lavaland/whitesands/fern,
-/obj/item/seeds/lavaland/whitesands/fireblossom,
+/obj/item/seeds/lavaland/fern,
+/obj/item/seeds/lavaland/fireblossom,
 /obj/item/seeds/lavaland/porcini,
 /obj/item/seeds/lavaland/polypore,
 /obj/item/seeds/lavaland/cactus,

diff --git a/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm b/_maps/RandomRuins/RockRuins/rockplanet_ore_proccessing_facility.dmm
@@ -108,7 +108,7 @@
 	dir = 10
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -163,7 +163,7 @@
 	dir = 1
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -298,7 +298,7 @@
 	dir = 6
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -383,7 +383,7 @@
 "xz" = (
 /obj/structure/railing,
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -512,7 +512,7 @@
 	dir = 8
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -531,7 +531,7 @@
 	},
 /obj/structure/railing/corner,
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -543,7 +543,7 @@
 	dir = 9
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -568,7 +568,7 @@
 	dir = 4
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -597,7 +597,7 @@
 	dir = 1
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -683,7 +683,7 @@
 	dir = 1
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;
@@ -759,7 +759,7 @@
 	dir = 8
 	},
 /obj/structure/lattice/lava{
-	icon = 'whitesands/icons/obj/smooth_structures/catwalk.dmi'
+	icon = 'icons/obj/smooth_structures/catwalk.dmi'
 	},
 /turf/open/lava/smooth{
 	smoothing_flags = 0;

diff --git a/_maps/shuttles/shiptest/chapel.dmm b/_maps/shuttles/shiptest/chapel.dmm
@@ -2206,7 +2206,7 @@
 /area/ship/hallway/starboard)
 "Ds" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce,
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit,

diff --git a/_maps/shuttles/shiptest/rigger_b.dmm b/_maps/shuttles/shiptest/rigger_b.dmm
@@ -940,8 +940,8 @@
 /area/ship/crew)
 "nv" = (
 /obj/structure/table/wood,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce,
-/obj/item/reagent_containers/food/snacks/grown/ash_flora/whitesands/puce,
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce,
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/puce,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,
 /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf,

diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm
@@ -46,7 +46,7 @@
 
 /atom/movable/screen/ghost/spawner_menu
 	name = "Spawner Menu"
-	icon = 'whitesands/icons/mob/screen_ghost.dmi'
+	icon = 'icons/hud/screen_ghost.dmi'
 	icon_state = "spawner_menu"
 
 /atom/movable/screen/ghost/spawner_menu/Click()

diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm
@@ -18,5 +18,5 @@
 /obj/item/weaponcrafting/silkstring
 	name = "silkstring"
 	desc = "A long piece of Silk that looks like a cable coil."
-	icon = 'whitesands/icons/obj/improvised.dmi'
+	icon = 'icons/obj/improvised.dmi'
 	icon_state = "silkstring"
diff --git a/code/datums/components/taped.dm b/code/datums/components/taped.dm
@@ -43,7 +43,7 @@
 	taped_integrity += patch_amount
 
 	tape_marks.Blend("#fff", ICON_ADD)
-	tape_marks.Blend(icon('whitesands/icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY)
+	tape_marks.Blend(icon('icons/obj/tapes.dmi', "[taped_icon_state]_mask"), ICON_MULTIPLY)
 	taped_icon = new(tape_marks)
 	I.add_overlay(taped_icon)
 	I.update_icon()

diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm
@@ -18,7 +18,7 @@
 		/obj/structure/flora/rock/pile/icy = 2,
 		/obj/structure/flora/grass/both = 6,
 		/obj/structure/flora/ash/chilly = 2,
-		/obj/structure/flora/ash/whitesands/puce = 2,
+		/obj/structure/flora/ash/puce = 2,
 	)
 
 /datum/map_generator/cave_generator/icemoon/surface

diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm
@@ -9,7 +9,7 @@
 		/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random = 40, /obj/structure/spawner/lavaland = 3, \
 		/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random = 30, /obj/structure/spawner/lavaland/legion = 3, \
 		SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10)
-	flora_spawn_list = list(/obj/structure/flora/ash/whitesands/fireblossom = 2, /obj/structure/flora/ash/whitesands/puce = 2, /obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/whitesands/fern = 2)
+	flora_spawn_list = list(/obj/structure/flora/ash/fireblossom = 2, /obj/structure/flora/ash/puce = 2, /obj/structure/flora/ash/leaf_shroom = 2 , /obj/structure/flora/ash/cap_shroom = 2 , /obj/structure/flora/ash/stem_shroom = 2 , /obj/structure/flora/ash/cacti = 1, /obj/structure/flora/ash/tall_shroom = 2, /obj/structure/flora/ash/fern = 2)
 
 	initial_closed_chance = 45
 	smoothing_iterations = 50

diff --git a/code/datums/mapgen/Cavegens/WhitesandsCaves.dm b/code/datums/mapgen/Cavegens/WhitesandsCaves.dm
@@ -9,7 +9,7 @@
 		/mob/living/simple_animal/hostile/asteroid/whitesands/survivor/random = 25, /obj/structure/spawner/lavaland/legion = 3, \
 		SPAWN_MEGAFAUNA = 4, /mob/living/simple_animal/hostile/asteroid/goldgrub = 10,
 		)
-	flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 4 , /obj/structure/flora/ash/cap_shroom = 4 , /obj/structure/flora/ash/stem_shroom = 4 , /obj/structure/flora/ash/cacti = 2, /obj/structure/flora/ash/tall_shroom = 4, /obj/structure/flora/ash/whitesands/fireblossom = 2, /obj/structure/flora/ash/whitesands/puce = 1)
+	flora_spawn_list = list(/obj/structure/flora/ash/leaf_shroom = 4 , /obj/structure/flora/ash/cap_shroom = 4 , /obj/structure/flora/ash/stem_shroom = 4 , /obj/structure/flora/ash/cacti = 2, /obj/structure/flora/ash/tall_shroom = 4, /obj/structure/flora/ash/fireblossom = 2, /obj/structure/flora/ash/puce = 1)
 
 	initial_closed_chance = 45
 	smoothing_iterations = 50

diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm
@@ -56,14 +56,14 @@
 /obj/item/wallframe/advanced_airlock_controller
 	name = "airlock controller frame"
 	desc = "Used for building advanced airlock controllers."
-	icon = 'whitesands/icons/obj/monitors.dmi'
+	icon = 'icons/obj/monitors.dmi'
 	icon_state = "aac_bitem"
 	result_path = /obj/machinery/advanced_airlock_controller
 
 /obj/machinery/advanced_airlock_controller
 	name = "advanced airlock controller"
 	desc = "A machine designed to control the operation of cycling airlocks"
-	icon = 'whitesands/icons/obj/monitors.dmi'
+	icon = 'icons/obj/monitors.dmi'
 	icon_state = "aac"
 	use_power = IDLE_POWER_USE
 	idle_power_usage = 4

diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
@@ -14,7 +14,7 @@
 	name = "cloning pod"
 	desc = "An electronically-lockable pod for growing organic tissue."
 	density = TRUE
-	icon = 'whitesands/icons/obj/machines/cloning.dmi'
+	icon = 'icons/obj/machines/cloning.dmi'
 	icon_state = "pod_0"
 	req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING.
 	verb_say = "states"

diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
@@ -331,8 +331,8 @@
 /obj/machinery/door/airlock/titanium
 	name = "shuttle airlock"
 	assemblytype = /obj/structure/door_assembly/door_assembly_titanium
-	icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
-	overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi'
+	icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
+	overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi'
 	normal_integrity = 400
 	has_hatch = FALSE
 
@@ -478,8 +478,8 @@
 
 /obj/machinery/door/airlock/shuttle
 	name = "shuttle airlock"
-	icon = 'whitesands/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //WS Edit - Classic Shuttle
-	overlays_file = 'whitesands/icons/obj/doors/airlocks/shuttle/overlays.dmi'
+	icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi' //WS Edit - Classic Shuttle //I'm leaving this. Your hubris will be remembered.
+	overlays_file = 'icons/obj/doors/airlocks/shuttle/old_overlays.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
 	has_hatch = FALSE
 

diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
@@ -197,31 +197,31 @@
 	update_freelook_sight()
 
 /obj/machinery/door/poddoor/multi_tile/four_tile_ver/
-	icon = 'whitesands/icons/obj/doors/1x4blast_vert.dmi'
+	icon = 'icons/obj/doors/1x4blast_vert.dmi'
 	bound_height = 128
 	dir = NORTH
 
 /obj/machinery/door/poddoor/multi_tile/three_tile_ver/
-	icon = 'whitesands/icons/obj/doors/1x3blast_vert.dmi'
+	icon = 'icons/obj/doors/1x3blast_vert.dmi'
 	bound_height = 96
 	dir = NORTH
 
 /obj/machinery/door/poddoor/multi_tile/two_tile_ver/
-	icon = 'whitesands/icons/obj/doors/1x2blast_vert.dmi'
+	icon = 'icons/obj/doors/1x2blast_vert.dmi'
 	bound_height = 64
 	dir = NORTH
 
 /obj/machinery/door/poddoor/multi_tile/four_tile_hor/
-	icon = 'whitesands/icons/obj/doors/1x4blast_hor.dmi'
+	icon = 'icons/obj/doors/1x4blast_hor.dmi'
 	bound_width = 128
 	dir = EAST
 
 /obj/machinery/door/poddoor/multi_tile/three_tile_hor/
-	icon = 'whitesands/icons/obj/doors/1x3blast_hor.dmi'
+	icon = 'icons/obj/doors/1x3blast_hor.dmi'
 	bound_width = 96
 	dir = EAST
 
 /obj/machinery/door/poddoor/multi_tile/two_tile_hor/
-	icon = 'whitesands/icons/obj/doors/1x2blast_hor.dmi'
+	icon = 'icons/obj/doors/1x2blast_hor.dmi'
 	bound_width = 64
 	dir = EAST
diff --git a/code/game/machinery/doors/spacepod.dm b/code/game/machinery/doors/spacepod.dm
@@ -1,7 +1,7 @@
 /obj/structure/spacepoddoor
 	name = "podlock"
 	desc = "Why it no open!!!"
-	icon = 'whitesands/icons/effects/beam.dmi'
+	icon = 'icons/effects/beam.dmi'
 	icon_state = "n_beam"
 	density = 1
 	anchored = 1

diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
@@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
 /obj/machinery/requests_console
 	name = "requests console"
 	desc = "A console intended to send requests between different vessels and settlements in a local region."
-	icon = 'whitesands/icons/obj/terminals.dmi' //WS Edit - Better Icons
+	icon = 'icons/obj/terminals.dmi'
 	icon_state = "req_comp0"
 	var/department = "Unknown" //The list of all departments on the station (Determined from this variable on each unit) Set this to the same thing if you want several consoles in one department
 	var/list/messages = list() //List of all messages

diff --git a/code/game/machinery/shuttle/custom_shuttle.dm b/code/game/machinery/shuttle/custom_shuttle.dm
@@ -4,7 +4,7 @@
 	density = TRUE
 	obj_integrity = 250
 	max_integrity = 250
-	icon = 'whitesands/icons/obj/shuttle.dmi'
+	icon = 'icons/obj/shuttle.dmi'
 	icon_state = "burst_plasma"
 	circuit = /obj/item/circuitboard/machine/shuttle/engine
 	var/icon_state_closed = "burst_plasma"

diff --git a/code/game/machinery/shuttle/shuttle_engine_types.dm b/code/game/machinery/shuttle/shuttle_engine_types.dm
@@ -126,7 +126,7 @@
 /obj/machinery/power/smes/shuttle
 	name = "electric engine precharger"
 	desc = "A medium-capacity, high transfer superconducting magnetic energy storage unit specially made for use with shuttle engines."
-	icon = 'whitesands/icons/obj/shuttle.dmi'
+	icon = 'icons/obj/shuttle.dmi'
 	input_level = 0
 	input_level_max = 50000
 	output_level = 50000

diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm
@@ -8,7 +8,7 @@
 	name = "shuttle atmospherics device"
 	desc = "This does something to do with shuttle atmospherics"
 	icon_state = "heater"
-	icon = 'whitesands/icons/obj/shuttle.dmi'
+	icon = 'icons/obj/shuttle.dmi'
 
 /obj/machinery/atmospherics/components/unary/shuttle/heater
 	name = "engine heater"

diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
@@ -32,7 +32,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /obj/effect/turf_decal
-	icon = 'whitesands/icons/turf/decals.dmi'
+	icon = 'icons/turf/decals.dmi'
 	icon_state = "warningline"
 	layer = TURF_DECAL_LAYER
 	var/detail_overlay

diff --git a/code/game/objects/effects/decals/turfdecal/flooring_decals.dm b/code/game/objects/effects/decals/turfdecal/flooring_decals.dm
@@ -722,5 +722,5 @@ TURF_DECAL_COLOR_HELPER(transparent/inteqbrown, "#4b2a18", 140)
 
 /obj/effect/turf_decal/solgov //Credit to baystation for these sprites!
 	alpha = 230
-	icon = 'whitesands/icons/obj/solgov_floor.dmi'
+	icon = 'icons/obj/solgov_floor.dmi'
 	icon_state = "center"