Фиксы и чистки

RepoStash · Jun 10, 2024 · a59a337 · a59a337
1 parent 837bcfd
commit a59a337
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 256 deletions.
diff --git a/maps/torch_fd/job/addition/service_job.dm → maps/torch_fd/job/addition/service_jobs.dm b/maps/torch_fd/job/addition/service_job.dm → maps/torch_fd/job/addition/service_jobs.dm
diff --git a/maps/torch_fd/job/torch_jobs.dm b/maps/torch_fd/job/torch_jobs.dm
@@ -28,7 +28,7 @@
 		/datum/job/senior_doctor, /datum/job/doctor, /datum/job/junior_doctor, /datum/job/chemist, /datum/job/medical_trainee,
 		/datum/job/psychiatrist,
 		/datum/job/qm, /datum/job/cargo_tech, /datum/job/mining,
-		/datum/job/senior_scientist, /datum/job/scientist, /datum/job/scientist_assistant, /datum/job/research_guard
+		/datum/job/senior_scientist, /datum/job/scientist, /datum/job/scientist_assistant, /datum/job/research_guard,
 		/datum/job/chief_steward, /datum/job/chef, /datum/job/janitor, /datum/job/crew,
 		/datum/job/cyborg,
 		/datum/job/chaplain,

diff --git a/mods/_fd/fd_assets/_fd_assets.dme b/mods/_fd/fd_assets/_fd_assets.dme
@@ -43,13 +43,6 @@
 #include "code/weapons/rsh21.dm"
 #include "code/weapons/sledgehammer.dm"
 
-#include "code/jobs/chief_steward.dm"
-#include "code/jobs/research_guard.dm"
-#include "code/jobs/pathfinder.dm"
-#include "code/jobs/research_director.dm"
-#include "code/jobs/passenger.dm"
-#include "code/jobs/ai.dm"
-
 #include "code/fd_sofa_override.dm"
 #include "code/floor_decals.dm"
 #include "code/fullscreen.dm"

diff --git a/mods/_fd/fd_assets/code/jobs/ai.dm b/mods/_fd/fd_assets/code/jobs/ai.dm
diff --git a/mods/_fd/fd_assets/code/jobs/chief_steward.dm b/mods/_fd/fd_assets/code/jobs/chief_steward.dm
diff --git a/mods/_fd/fd_assets/code/jobs/passenger.dm b/mods/_fd/fd_assets/code/jobs/passenger.dm
diff --git a/mods/_fd/fd_assets/code/jobs/pathfinder.dm b/mods/_fd/fd_assets/code/jobs/pathfinder.dm
diff --git a/mods/_fd/fd_assets/code/jobs/research_director.dm b/mods/_fd/fd_assets/code/jobs/research_director.dm
diff --git a/mods/_fd/fd_assets/code/jobs/research_guard.dm b/mods/_fd/fd_assets/code/jobs/research_guard.dm
diff --git a/mods/_fd/fd_guns/code/guns/k342.dm b/mods/_fd/fd_guns/code/guns/k342.dm
@@ -106,12 +106,12 @@
 /obj/item/gun/energy/k342
 	name = "plasma rifle"
 	desc = "K342 Barrakuda is the latest plasma weapon created by NanoTrasen. It can fire several types of charges: stunning, incendiary and lethal."
-	icon = 'mods/_fd/fd_assets/icons/obj/k342.dmi'
+	icon = 'mods/_fd/fd_guns/icons/k342.dmi'
 	w_class = ITEM_SIZE_LARGE
 	item_icons = list(
-		slot_l_hand_str = 'mods/_fd/fd_assets/icons/onmob/lefthand-guns.dmi',
-		slot_r_hand_str = 'mods/_fd/fd_assets/icons/onmob/righthand-guns.dmi',
-		slot_back_str = 'mods/_fd/fd_assets/icons/onmob/back-guns.dmi'
+		slot_l_hand_str = 'mods/_fd/fd_guns/icons/onmob/lefthand-guns.dmi',
+		slot_r_hand_str = 'mods/_fd/fd_guns/icons/onmob/righthand-guns.dmi',
+		slot_back_str = 'mods/_fd/fd_guns/icons/onmob/back-guns.dmi'
 		)
 	slot_flags = SLOT_BACK|SLOT_BELT
 	icon_state = "barrakuda_off"
@@ -154,7 +154,7 @@
 /obj/item/gun/energy/k342/sniper
 	name = "plasma sniper rifle"
 	desc = "K480 Skat is the latest heavy plasma weapon created by NanoTrasen for SolGov snipers, capable to fire several types of charges: stunning, incendiary, and lethal bolts. Advanced magnetic constriction technology improves accuracy and firepower."
-	icon = 'mods/_fd/fd_assets/icons/obj/k480.dmi'
+	icon = 'mods/_fd/fd_guns/icons/k480.dmi'
 	icon_state = "mantis_off"
 	item_state = "mantis"
 	w_class = ITEM_SIZE_LARGE