refucktor

SierraBay · Nov 18, 2023 · f3dc2a3 · f3dc2a3
1 parent af78452
commit f3dc2a3
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 76 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -3320,6 +3320,7 @@
 #include "maps\_maps.dm"
 #include "mods\_modpack.dm"
 #include "mods\global_modpacks.dm"
+#include "mods\_master_files\code\game\objects\effects\animations\teleportation.dm"
 #include "mods\_master_files\code\game\objects\effects\decals\contraband.dm"
 #include "mods\_master_files\code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
 #include "mods\_master_files\code\modules\client\asset_cache.dm"

diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm
@@ -166,6 +166,7 @@
 	// USED MODS
 	// Keep them in ascending alphabetical order, please
 
+	#include "../../mods/_antagonists/_antagonists.dme"
 	#include "../../mods/_maps/liberia/_map_liberia.dme"
 	#include "../../mods/_maps/sentinel/_map_sentinel.dme"
 	#include "../../mods/_maps/farfleet/_map_farfleet.dme"

diff --git a/maps/sierra/structures/closets/misc.dm b/maps/sierra/structures/closets/misc.dm
@@ -60,68 +60,3 @@
 /obj/structure/closet/crate/present
 	name = "present crate"
 	desc = "Wow, a present!"
-
-///Ninja equipment loadouts. Placed here because author overrided them using Torch files. Now we overriding this again for some QoL stuff.
-/obj/structure/closet/crate/ninja/sol
-	name = "sol equipment crate"
-	desc = "A tactical equipment crate."
-
-/obj/structure/closet/crate/ninja/sol/WillContain()
-	return list(
-		/obj/item/rig/light/ninja/sol,
-		/obj/item/gun/projectile/pistol/m22f,
-		/obj/item/ammo_magazine/pistol/double = 2,
-		/obj/item/clothing/under/scga/utility/urban,
-		/obj/item/clothing/shoes/swat,
-		/obj/item/clothing/accessory/scga_rank/e6,
-		/obj/item/device/encryptionkey/away_scg_patrol
-	)
-
-/obj/structure/closet/crate/ninja/gcc
-	name = "gcc equipment crate"
-	desc = "A heavy equipment crate."
-
-/obj/structure/closet/crate/ninja/gcc/WillContain()
-	return list(
-		/obj/item/rig/light/ninja/gcc,
-		/obj/item/gun/projectile/pistol/optimus,
-		/obj/item/ammo_magazine/pistol/double = 2,
-		/obj/item/ammo_magazine/box/minigun = 2,
-		/obj/item/clothing/under/iccgn/utility,
-		/obj/item/clothing/shoes/iccgn/utility,
-		/obj/item/clothing/accessory/iccgn_rank/or6,
-		/obj/item/device/encryptionkey/iccgn
-	)
-
-/obj/structure/closet/crate/ninja/corpo
-	name = "corporate equipment crate"
-	desc = "A patented equipment crate."
-
-/obj/structure/closet/crate/ninja/corpo/WillContain()
-	return list(
-		/obj/item/rig/light/ninja/corpo,
-		/obj/item/gun/energy/gun,
-		/obj/item/inducer,
-		/obj/item/clothing/under/rank/security/corp,
-		/obj/item/clothing/shoes/swat,
-		/obj/item/clothing/accessory/badge/holo,
-		/obj/item/storage/box/syndie_kit/jaunter
-	)
-
-/obj/structure/closet/crate/ninja/merc
-	name = "mercenary equipment crate"
-	desc = "A traitorous equipment crate."
-
-/obj/structure/closet/crate/ninja/merc/WillContain()
-	return list(
-		/obj/item/rig/merc/ninja,
-		/obj/item/gun/projectile/revolver/medium,
-		/obj/item/ammo_magazine/speedloader = 2,
-		/obj/item/clothing/under/syndicate/combat,
-		/obj/item/clothing/shoes/swat,
-		/obj/item/clothing/mask/gas/syndicate,
-		/obj/item/storage/backpack/dufflebag/syndie_kit/plastique,
-		/obj/item/storage/box/anti_photons,
-		/obj/item/device/encryptionkey/syndicate,
-		/obj/item/card/emag
-	)
diff --git a/mods/_antagonists/_antagonists.dm b/mods/_antagonists/_antagonists.dm
@@ -0,0 +1,4 @@
+/singleton/modpack/antagonists
+	name = "SierraBay Antag tweaks"
+	desc = "Общие изменения антагонистов, которые используются в форке SierraBay."
+	author = "LordNest"
diff --git a/mods/_antagonists/_antagonists.dme b/mods/_antagonists/_antagonists.dme
@@ -0,0 +1,11 @@
+#ifndef MODPACK_ANTAGONISTS
+#define MODPACK_ANTAGONISTS
+
+#include "_antagonists.dm"
+
+
+#include "code/revolutionary.dm"
+#include "code/operative.dm"
+#include "code/traitor.dm"
+
+#endif
diff --git a/mods/_antagonists/code/operative.dm b/mods/_antagonists/code/operative.dm
@@ -0,0 +1,64 @@
+///Ninja equipment loadouts. Placed here because author overrided them using Torch files. Now we overriding this again for some QoL stuff.
+/obj/structure/closet/crate/ninja/sol
+	name = "sol equipment crate"
+	desc = "A tactical equipment crate."
+
+/obj/structure/closet/crate/ninja/sol/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/sol,
+		/obj/item/gun/projectile/pistol/m22f,
+		/obj/item/ammo_magazine/pistol/double = 2,
+		/obj/item/clothing/under/scga/utility/urban,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/accessory/scga_rank/e6,
+		/obj/item/device/encryptionkey/away_scg_patrol
+	)
+
+/obj/structure/closet/crate/ninja/gcc
+	name = "gcc equipment crate"
+	desc = "A heavy equipment crate."
+
+/obj/structure/closet/crate/ninja/gcc/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/gcc,
+		/obj/item/gun/projectile/pistol/optimus,
+		/obj/item/ammo_magazine/pistol/double = 2,
+		/obj/item/ammo_magazine/box/minigun = 2,
+		/obj/item/clothing/under/iccgn/utility,
+		/obj/item/clothing/shoes/iccgn/utility,
+		/obj/item/clothing/accessory/iccgn_rank/or6,
+		/obj/item/device/encryptionkey/iccgn
+	)
+
+/obj/structure/closet/crate/ninja/corpo
+	name = "corporate equipment crate"
+	desc = "A patented equipment crate."
+
+/obj/structure/closet/crate/ninja/corpo/WillContain()
+	return list(
+		/obj/item/rig/light/ninja/corpo,
+		/obj/item/gun/energy/gun,
+		/obj/item/inducer,
+		/obj/item/clothing/under/rank/security/corp,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/accessory/badge/holo,
+		/obj/item/storage/box/syndie_kit/jaunter
+	)
+
+/obj/structure/closet/crate/ninja/merc
+	name = "mercenary equipment crate"
+	desc = "A traitorous equipment crate."
+
+/obj/structure/closet/crate/ninja/merc/WillContain()
+	return list(
+		/obj/item/rig/merc/ninja,
+		/obj/item/gun/projectile/revolver/medium,
+		/obj/item/ammo_magazine/speedloader = 2,
+		/obj/item/clothing/under/syndicate/combat,
+		/obj/item/clothing/shoes/swat,
+		/obj/item/clothing/mask/gas/syndicate,
+		/obj/item/storage/backpack/dufflebag/syndie_kit/plastique,
+		/obj/item/storage/box/anti_photons,
+		/obj/item/device/encryptionkey/syndicate,
+		/obj/item/card/emag
+	)
diff --git a/.../sierra-tweaks/gamemodes/revolutionary.dm → mods/_antagonists/code/revolutionary.dm b/.../sierra-tweaks/gamemodes/revolutionary.dm → mods/_antagonists/code/revolutionary.dm
diff --git a/packs/infinity/items/traitor.dm → mods/_antagonists/code/traitor.dm b/packs/infinity/items/traitor.dm → mods/_antagonists/code/traitor.dm
@@ -6,7 +6,7 @@
 	name = "door charge"
 	desc = "This is a booby trap, planted on doors. When door opens, it will explode!."
 	gender = PLURAL
-	icon = 'packs/infinity/icons/obj/door_charge.dmi'
+	icon = 'mods/_antagonists/icons/obj/door_charge.dmi'
 	icon_state = "door_charge"
 	item_state = "door_charge"
 	item_flags = ITEM_FLAG_NO_BLUDGEON
@@ -55,9 +55,9 @@
 //
 
 /obj/item/device/syndietele
-	name = "strange beacon"
+	name = "strange sensor"
 	desc = "Looks like regular powernet sensor, but this one almost black and have spooky red light blinking"
-	icon = 'packs/infinity/icons/obj/syndiejaunter.dmi'
+	icon = 'mods/_antagonists/icons/obj/syndiejaunter.dmi'
 	icon_state = "beacon"
 	item_state = "signaler"
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_ESOTERIC = 3)
@@ -67,7 +67,7 @@
 /obj/item/device/syndiejaunter
 	name = "strange device"
 	desc = "This thing looks like remote. Almost black, with red button and status display."
-	icon = 'packs/infinity/icons/obj/syndiejaunter.dmi'
+	icon = 'mods/_antagonists/icons/obj/syndiejaunter.dmi'
 	icon_state = "jaunter"
 	item_state = "jaunter"
 	w_class = ITEM_SIZE_SMALL

diff --git a/packs/infinity/icons/obj/door_charge.dmi → mods/_antagonists/icons/obj/door_charge.dmi b/packs/infinity/icons/obj/door_charge.dmi → mods/_antagonists/icons/obj/door_charge.dmi
diff --git a/packs/infinity/icons/obj/syndiejaunter.dmi → .../_antagonists/icons/obj/syndiejaunter.dmi b/packs/infinity/icons/obj/syndiejaunter.dmi → .../_antagonists/icons/obj/syndiejaunter.dmi
diff --git a/packs/infinity/_helpers/teleportation.dm → ...jects/effects/animations/teleportation.dm b/packs/infinity/_helpers/teleportation.dm → ...jects/effects/animations/teleportation.dm
@@ -1,14 +1,14 @@
 /proc/animated_teleportation(atom/movable/target, atom/anchor)
 	if(ismob(target))
 		to_chat(target, SPAN_WARNING("You feel like something pulling you in bluespace."))
-	var/obj/temporary/A = new(get_turf(target), 24.5, 'packs/infinity/icons/effects/bs_silk.dmi', "silc_teleport_back")
+	var/obj/temporary/A = new(get_turf(target), 24.5, 'mods/_master_files/icons/effects/bs_silk.dmi', "silc_teleport_back")
 	target.set_dir(2)
 	target.forceMove(A)
 	addtimer(new Callback(GLOBAL_PROC, .proc/animated_teleportation_ending, target, anchor), 23)
 
 /proc/animated_teleportation_ending(atom/movable/target, atom/anchor)
 	target.set_dir(2)
-	target.forceMove(new /obj/temporary(get_turf(anchor), 26.5, 'packs/infinity/icons/effects/bs_silk.dmi', "silc_get_hub"))
+	target.forceMove(new /obj/temporary(get_turf(anchor), 26.5, 'mods/_master_files/icons/effects/bs_silk.dmi', "silc_get_hub"))
 	addtimer(new Callback(GLOBAL_PROC, .proc/finalize_animated_teleportation, target, anchor), 24)
 
 /proc/finalize_animated_teleportation(atom/movable/target, atom/anchor)

diff --git a/packs/infinity/icons/effects/bs_silk.dmi → mods/_master_files/icons/effects/bs_silk.dmi b/packs/infinity/icons/effects/bs_silk.dmi → mods/_master_files/icons/effects/bs_silk.dmi
diff --git a/packs/infinity/_pack.dm b/packs/infinity/_pack.dm
@@ -11,7 +11,6 @@
 
 // HELPERS
 #include "_helpers\colors.dm"
-#include "_helpers\teleportation.dm"
 
 // Interactions (including overriding)
 #include "interactions\glup_down.dm"
@@ -49,7 +48,6 @@
 #include "items\powertools.dm"
 #include "items\towels.dm"
 #include "items\toys.dm"
-#include "items\traitor.dm"
 #include "items\wheelchair_kit.dm"
 
 // Guns

diff --git a/packs/sierra-tweaks/_pack.dm b/packs/sierra-tweaks/_pack.dm
@@ -11,9 +11,6 @@
 // Client
 #include "client\spawnpoints.dm"
 
-// Gamemodes
-#include "gamemodes\revolutionary.dm"
-
 // Mob
 #include "mob\say.dm"
 #include "mob\stat.dm"