Не уберу ножницы

SierraBay · Dec 2, 2023 · b6ba360 · b6ba360
1 parent 29ceb64
commit b6ba360
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 49 deletions.
diff --git a/packs/infinity/icons/mob/wrist_computer.dmi → maps/sierra/icons/mob/wrist_computer.dmi b/packs/infinity/icons/mob/wrist_computer.dmi → maps/sierra/icons/mob/wrist_computer.dmi
diff --git a/packs/infinity/icons/obj/wrist_computer.dmi → maps/sierra/icons/obj/wrist_computer.dmi b/packs/infinity/icons/obj/wrist_computer.dmi → maps/sierra/icons/obj/wrist_computer.dmi
diff --git a/packs/infinity/items/modular_computer.dm → maps/sierra/items/modular_computer.dm b/packs/infinity/items/modular_computer.dm → maps/sierra/items/modular_computer.dm
@@ -1,7 +1,7 @@
 /obj/item/modular_computer/pda/wrist
 	name = "wrist computer"
 	desc = "A wrist-mounted modular personal computer. Very stylish."
-	icon = 'packs/infinity/icons/obj/wrist_computer.dmi'
+	icon = 'maps/sierra/icons/obj/wrist_computer.dmi'
 	icon_state = "wc_base"
 	color = COLOR_GUNMETAL
 	item_state_slots = list(slot_wear_id_str = "wc_base")
@@ -11,10 +11,10 @@
 	slot_flags = SLOT_ID | SLOT_BELT
 
 	icon_state_unpowered = "wc_base"
-	item_icons = list(slot_wear_id_str = 'packs/infinity/icons/mob/wrist_computer.dmi')
+	item_icons = list(slot_wear_id_str = 'maps/sierra/icons/mob/wrist_computer.dmi')
 	item_state = "wc_base"
 
-	interact_sounds = list('packs/infinity/sound/items/ui_pipboy_select.wav')
+	interact_sounds = list('maps/sierra/sound/items/ui_pipboy_select.wav')
 
 /obj/item/modular_computer/pda/wrist/get_mob_overlay(mob/user_mob, slot)
 	var/image/ret = ..()

diff --git a/maps/sierra/loadout/loadout_pda.dm b/maps/sierra/loadout/loadout_pda.dm
@@ -41,7 +41,6 @@
 		. = item
 
 
-/* SIERRA TODO:
 /datum/gear/utility/wrist_computer
 	display_name = "Wrist computer selection"
 	path = /obj/item/modular_computer/pda/wrist
@@ -84,4 +83,3 @@
 			NME.log_in()
 	if(H.equip_to_slot_if_possible(item, slot, del_on_fail = 1))
 		. = item
-		*/
diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm
@@ -58,6 +58,7 @@
 	#include "items/items.dm"
 	#include "items/lighting.dm"
 	#include "items/machinery.dm"
+	#include "items/modular_computer.dm"
 	#include "items/manuals.dm"
 	#include "items/mech.dm"
 	#include "items/papers.dm"

diff --git a/...infinity/sound/items/ui_pipboy_select.wav → maps/sierra/sound/items/ui_pipboy_select.wav b/...infinity/sound/items/ui_pipboy_select.wav → maps/sierra/sound/items/ui_pipboy_select.wav
diff --git a/packs/infinity/_datums/loadout/gears.dm b/packs/infinity/_datums/loadout/gears.dm
diff --git a/packs/infinity/_pack.dm b/packs/infinity/_pack.dm
@@ -5,7 +5,6 @@
 #include "__defines\guns.dm"
 
 // DATUMS
-#include "_datums\loadout\gears.dm"
 #include "_datums\reagents\experimental.dm"
 
 // HELPERS
@@ -38,7 +37,6 @@
 #include "items\chairs.dm"
 #include "items\chemistry.dm"
 #include "items\grown.dm"
-#include "items\modular_computer.dm"
 #include "items\multimeter.dm"
 #include "items\powertools.dm"
 #include "items\towels.dm"