war_event

Fluffy-Frontier · Nov 16, 2024 · 21b9b20 · 21b9b20
1 parent ab378e5
commit 21b9b20
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 76 deletions.
diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm
@@ -6,10 +6,7 @@
 	gloves = /obj/item/clothing/gloves/combat
 	back = /obj/item/storage/backpack/fireproof
 	ears = /obj/item/radio/headset/syndicate/alt
-	l_pocket = /obj/item/modular_computer/pda/nukeops
-	r_pocket = /obj/item/pen/edagger
-	id = /obj/item/card/id/advanced/chameleon
-	belt = /obj/item/gun/ballistic/automatic/pistol/clandestine
+	id = /obj/item/card/id/red
 
 	skillchips = list(/obj/item/skillchip/disk_verifier)
 	box = /obj/item/storage/box/survival/syndie
@@ -20,7 +17,6 @@
 	/// The type of uplink to be given on equip.
 	var/uplink_type = /obj/item/uplink/nuclear
 
-	id_trim = /datum/id_trim/chameleon/operative
 
 /datum/outfit/syndicate/plasmaman
 	name = "Syndicate Operative - Basic (Plasmaman)"
@@ -134,7 +130,6 @@
 	suit = /obj/item/clothing/suit/armor/vest/alt
 	head = /obj/item/clothing/head/helmet/swat
 	neck = /obj/item/clothing/neck/large_scarf/syndie
-	glasses = /obj/item/clothing/glasses/cold
 	faction = "the Gorlex Marauders"
 
 /datum/outfit/syndicate/reinforcement/cybersun

diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm
@@ -35,8 +35,7 @@
 	mask = /obj/item/clothing/mask/gas/syndicate
 	back = /obj/item/mod/control/pre_equipped/nuclear
 	r_pocket = /obj/item/tank/internals/emergency_oxygen
-	id = /obj/item/card/id/advanced/chameleon
-	id_trim = /datum/id_trim/chameleon/operative
+	id = /obj/item/card/id/red
 
 /obj/effect/mob_spawn/corpse/human/syndicatecommando/lessenedgear
 	outfit = /datum/outfit/syndicatecommandocorpse/lessenedgear
@@ -327,8 +326,7 @@
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	head = /obj/item/clothing/head/helmet/swat/nanotrasen
 	back = /obj/item/storage/backpack/security
-	id = /obj/item/card/id/advanced/centcom
-	id_trim = /datum/id_trim/centcom/corpse/assault
+	id = /obj/item/card/id/green
 
 /obj/effect/mob_spawn/corpse/human/nanotrasenelitesoldier
 	name = "\improper Nanotrasen Elite Assault Officer Corpse"
@@ -343,8 +341,7 @@
 	gloves = /obj/item/clothing/gloves/combat
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	back = /obj/item/mod/control/pre_equipped/responsory/security
-	id = /obj/item/card/id/advanced/centcom
-	id_trim = /datum/id_trim/centcom/ert/security
+	id = /obj/item/card/id/green
 
 /obj/effect/mob_spawn/corpse/human/cat_butcher
 	name = "The Cat Surgeon"

diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
@@ -1252,15 +1252,15 @@
 	)
 
 /datum/armor/mod_theme_syndicate
-	melee = 15
-	bullet = 20
-	laser = 15
-	energy = 15
-	bomb = 35
+	melee = 50
+	bullet = 40
+	laser = 50
+	energy = 50
+	bomb = 50
 	bio = 100
-	fire = 50
+	fire = 100
 	acid = 90
-	wound = 25
+	wound = 10
 
 /datum/mod_theme/elite
 	name = "elite"

diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
@@ -234,15 +234,12 @@
 	applied_cell = /obj/item/stock_parts/power_store/cell/super
 	applied_modules = list(
 		/obj/item/mod/module/storage/syndicate,
-		/obj/item/mod/module/shock_absorber,
-		/obj/item/mod/module/emp_shield,
 		/obj/item/mod/module/magnetic_harness,
 		/obj/item/mod/module/jetpack,
-		/obj/item/mod/module/pathfinder,
 		/obj/item/mod/module/flashlight,
 		/obj/item/mod/module/dna_lock,
 		/obj/item/mod/module/hat_stabilizer/syndicate,
-		/obj/item/mod/module/quick_cuff,
+		/obj/item/mod/module/visor/sechud,
 	)
 	default_pins = list(
 		/obj/item/mod/module/armor_booster,
@@ -463,7 +460,7 @@
 		/obj/item/mod/module/emp_shield,
 		/obj/item/mod/module/magnetic_harness,
 		/obj/item/mod/module/flashlight,
-		/obj/item/mod/module/quick_cuff,
+		/obj/item/mod/module/visor/sechud,
 	)
 	/// The insignia type, insignias show what sort of member of the ERT you're dealing with.
 	var/insignia_type = /obj/item/mod/module/insignia

diff --git a/modular_nova/modules/goofsec/code/sol_fed.dm b/modular_nova/modules/goofsec/code/sol_fed.dm
@@ -527,28 +527,21 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	name = "911 Response: SolFed Military"
 
 	uniform = /obj/item/clothing/under/sol_peacekeeper
-	head = /obj/item/clothing/head/helmet/sf_sacrificial
+	head = /obj/item/clothing/head/helmet/swat/nanotrasen
 	mask = /obj/item/clothing/mask/gas/alt
 	gloves = /obj/item/clothing/gloves/combat
-	suit = /obj/item/clothing/suit/armor/sf_sacrificial
+	suit = /obj/item/clothing/suit/armor/vest
 	shoes = /obj/item/clothing/shoes/jackboots
 
 	back = /obj/item/storage/backpack
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/headset_solfed/sec
-	l_pocket = /obj/item/restraints/handcuffs
 	r_pocket = /obj/item/flashlight/seclite
-	id = /obj/item/card/id/advanced/solfed
-	r_hand = /obj/item/gun/ballistic/automatic/sol_rifle
+	id = /obj/item/card/id/blue
 	backpack_contents = list(
-		/obj/item/storage/box/handcuffs = 1,
-		/obj/item/sacrificial_face_shield = 1,
-		/obj/item/melee/baton/security/loaded = 1,
-		/obj/item/ammo_box/magazine/c40sol_rifle/standard = 4,
+		/obj/item/storage/box/survival/engineer/marine = 1,
 	)
 
-	id_trim = /datum/id_trim/solfed
-
 /obj/item/solfed_reporter
 	name = "SolFed reporter"
 	desc = "Use this in-hand to vote to call SolFed backup. If half your team votes for it, SWAT will be dispatched."

diff --git a/modular_nova/modules/marines/code/mod.dm b/modular_nova/modules/marines/code/mod.dm
@@ -68,29 +68,24 @@
 
 /datum/armor/mod_theme_marines
 	melee = 50
-	bullet = 50
+	bullet = 40
 	laser = 50
 	energy = 50
 	bomb = 50
 	bio = 100
 	fire = 100
-	acid = 50
-	wound = 20
+	acid = 90
+	wound = 10
 
 /obj/item/mod/control/pre_equipped/marine
 	theme = /datum/mod_theme/marines
 	applied_cell = /obj/item/stock_parts/power_store/cell/bluespace
 	applied_modules = list(
 		/obj/item/mod/module/storage/large_capacity,
-		/obj/item/mod/module/emp_shield,
 		/obj/item/mod/module/magnetic_harness,
 		/obj/item/mod/module/holster,
 		/obj/item/mod/module/flashlight,
 		/obj/item/mod/module/jetpack,
-		/obj/item/mod/module/noslip,
-		/obj/item/mod/module/power_kick,
-		/obj/item/mod/module/megaphone,
-		/obj/item/mod/module/springlock/contractor,
 		/obj/item/mod/module/dna_lock, //in lieu of req_access
 		/obj/item/mod/module/visor/sechud, //for identifying teammates also in suits
 	)

diff --git a/modular_nova/modules/modular_ert/code/marine_override/modified_equipment.dm b/modular_nova/modules/modular_ert/code/marine_override/modified_equipment.dm
@@ -12,17 +12,13 @@
 	r_hand = null
 
 /datum/outfit/centcom/ert/marine/security //generic and/or heavy
-	suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun
-	belt = /obj/item/storage/belt/military/assault/full/m44a
 	back = /obj/item/mod/control/pre_equipped/marine
 	backpack_contents = list(
 		/obj/item/storage/box/survival/engineer/marine = 1,
-		/obj/item/melee/baton/security/loaded = 1,
-		/obj/item/storage/box/handcuffs = 1,
-		/obj/item/ammo_box/advanced/s12gauge/buckshot/marine = 2,
 	)
 	l_hand = null
 	r_hand = null
+	id = /obj/item/card/id/blue
 
 /datum/outfit/centcom/ert/marine/medic //medic
 	suit_store = /obj/item/gun/ballistic/automatic/ar/modular/m44a/scoped

diff --git a/modular_nova/modules/novaya_ert/code/mod_suit.dm b/modular_nova/modules/novaya_ert/code/mod_suit.dm
@@ -63,14 +63,14 @@
 
 /datum/armor/mod_theme_frontline
 	melee = 50
-	bullet = 60
-	laser = 40
+	bullet = 40
+	laser = 50
 	energy = 50
-	bomb = 60
+	bomb = 50
 	bio = 100
-	fire = 50
-	acid = 80
-	wound = 25
+	fire = 100
+	acid = 90
+	wound = 10
 
 /obj/item/mod/control/pre_equipped/frontline
 	theme = /datum/mod_theme/frontline
@@ -85,10 +85,10 @@
 		/obj/item/mod/module/storage/syndicate,
 		/obj/item/mod/module/thermal_regulator,
 		/obj/item/mod/module/status_readout/operational,
-		/obj/item/mod/module/auto_doc,
-		/obj/item/mod/module/visor/thermal,
 		/obj/item/mod/module/jetpack,
+		/obj/item/mod/module/visor/sechud,
 		/obj/item/mod/module/magboot/advanced,
+		/obj/item/mod/module/dna_lock,
 	)
 	default_pins = list(
 		/obj/item/mod/module/visor/thermal,

diff --git a/modular_nova/modules/novaya_ert/code/outfit.dm b/modular_nova/modules/novaya_ert/code/outfit.dm
@@ -1,33 +1,21 @@
 /datum/outfit/centcom/ert/nri
 	name = "Novaya Rossiyskaya Imperiya Soldier"
 	head = null
-	glasses = /obj/item/clothing/glasses/night
 	ears = /obj/item/radio/headset/headset_cent/alt/with_key
 	mask = /obj/item/clothing/mask/gas/hecu2
 	uniform = /obj/item/clothing/under/costume/nri
 	suit = null
 	suit_store = null
 	gloves = /obj/item/clothing/gloves/combat
-	belt = /obj/item/storage/belt/military/nri/soldier
 	back = /obj/item/mod/control/pre_equipped/frontline/ert
 	backpack_contents = list(
 		/obj/item/storage/box/nri_survival_pack,
-		/obj/item/storage/medkit/emergency,
-		/obj/item/advanced_choice_beacon/nri/heavy,
-		/obj/item/beamout_tool,
-		/obj/item/crucifix,
-		/obj/item/reagent_containers/cup/glass/waterbottle/large/cryptobiolin,
-		/obj/item/ammo_box/magazine/recharge/plasma_battery,
-		/obj/item/gun/ballistic/automatic/pistol/plasma_marksman,
 	)
 	l_pocket = /obj/item/knife/combat/survival
-	r_pocket = /obj/item/ammo_box/magazine/recharge/plasma_battery
-	shoes = /obj/item/clothing/shoes/combat
 
-	l_hand = /obj/item/gun/ballistic/automatic/lanca
+	shoes = /obj/item/clothing/shoes/combat
 
-	id = /obj/item/card/id/advanced/centcom/ert/nri
-	id_trim = /datum/id_trim/nri
+	id = /obj/item/card/id/yellow
 
 /datum/outfit/centcom/ert/nri/commander
 	name = "Novaya Rossiyskaya Imperiya Platoon Commander"

diff --git a/modular_nova/modules/novaya_ert/code/surplus_armor.dm b/modular_nova/modules/novaya_ert/code/surplus_armor.dm
@@ -22,14 +22,14 @@
 // CIN armor is decently tough against bullets and wounding, but flounders when lasers enter the play, because it wasn't designed to protect against those much
 
 /datum/armor/cin_surplus_armor
-	melee = 30
-	bullet = 40
-	laser = 10
-	energy = 10
-	bomb = 40
+	melee = 35
+	bullet = 30
+	laser = 30
+	energy = 40
+	bomb = 25
 	fire = 50
 	acid = 50
-	wound = 20
+	wound = 10
 
 // Hats