Ninja tweaks: sledgehammer edition (#11282)

2025-12-24 00:51:26 +00:00 · 2021-02-25 11:57:07 -03:00
parent 1e11c7368c
commit 9cf3782625
11 changed files with 271 additions and 25 deletions
--- a/code/datums/uplink/gear
+++ b/code/datums/uplink/gear
@@ -65,3 +65,14 @@
 	name = "Frontier Cowboy (Single)"
 	path = /obj/structure/closet/crate/secure/gear_loadout/ram_ranch/single
 	item_cost = 10
+
+/datum/uplink_item/item/gear_loadout/kosmostrelki
+	name = "Kosmostrelki Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits and the hardsuit are only usable by Tajara."
+	path = /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki
+
+/datum/uplink_item/item/gear_loadout/kosmostrelki_single
+	name = "Kosmostrelki Assets (Single)"
+	desc = "A crate containing gear for a single individual.The voidsuit is only usable by Tajara."
+	path = /obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single
+	item_cost = 15
--- a/code/datums/uplink/ninja_modules.dm
+++ b/code/datums/uplink/ninja_modules.dm
@@ -63,3 +63,9 @@
 	desc = "A chemical injector that allows the user to inject themsleves with combat chemicals."
 	item_cost = 4
 	path = /obj/item/rig_module/chem_dispenser/combat
+
+/datum/uplink_item/item/ninja_modules/self_destruct
+	name = "Self-destruct Module"
+	desc = "A Self-destruct Module that causes an explosion when the user dies or presses the switch."
+	item_cost = 8
+	path = 	/obj/item/rig_module/self_destruct
--- a/code/datums/uplink/ninja_rigs.dm
+++ b/code/datums/uplink/ninja_rigs.dm
@@ -8,64 +8,64 @@
 	name = "Solarian Military Hardsuit"
 	desc = "A Sheridan-type military hardsuit utilized by Solarian armed forces. Beefy. Only wearable by Humans."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/military/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_sol

 /datum/uplink_item/item/ninja_rigs/gunslinger
 	name = "Coalition Gunslinger Suit"
 	desc = "A gunslinger suit popular among Coalition rangers. Only wearable by Humans."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/gunslinger/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_gunslinger

 /datum/uplink_item/item/ninja_rigs/breacher
 	name = "Hegemony Breacher Suit"
 	desc = "A walking tank, one of the most armored suits in existence. Only wearable by Unathi."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/unathi/fancy/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_breacher

 /datum/uplink_item/item/ninja_rigs/tesla
 	name = "People's Republic Tesla Suit"
 	desc = "A Tajaran hardsuit built for use by the Tesla Brigade. Only wearable by Tajara."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/tesla/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_tesla

 /datum/uplink_item/item/ninja_rigs/strike
 	name = "Eridani PMC Strike Suit"
 	desc = "A powerful brawling suit which often spearheads police raids. Only wearable by Humans."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/strike/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_strike

 /datum/uplink_item/item/ninja_rigs/jinxiang
 	name = "Jinxiang Pattern Combat Suit"
 	desc = "A Dominian take on the infamous Bunker Suit. Only wearable by Humans."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/jinxiang/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_jinxiang

 /datum/uplink_item/item/ninja_rigs/elyra
 	name = "Elyran Battlesuit"
 	desc = "An Elyran battlesuit which is nigh-impervious to heat. Only wearable by Humans."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/elyran/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_elyra

 /datum/uplink_item/item/ninja_rigs/hacker
 	name = "Cyberwarfare Suit"
 	desc = "A less sturdy, but more agile cyberwarfare suit. Perfect for espionage. No species restrictions."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/light/hacker/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_hacker

 /datum/uplink_item/item/ninja_rigs/techno
 	name = "Technoconglomerate Mobility Suit"
 	desc = "A thin suit with speed-boosting actuators. Only wearable by Offworlders."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/light/offworlder/techno/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_techno

 /datum/uplink_item/item/ninja_rigs/crimson
 	name = "Crimson Hardsuit"
 	desc = "A powerful hardsuit with an excess of powerful, illegal modules. No species restrictions."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/merc/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_crimson

 /datum/uplink_item/item/ninja_rigs/rhino
 	name = "Rhino Suit"
 	desc = "The crimson hardsuit's ugly cousin, plated heavily with ballistic armor. No species restrictions."
 	item_cost = DEFAULT_TELECRYSTAL_AMOUNT
-	path = /obj/item/rig/merc/distress/ninja
+	path = /obj/structure/closet/crate/secure/gear_loadout/ninja_rhino
--- a/code/game/gamemodes/mixed/intrigue.dm
+++ b/code/game/gamemodes/mixed/intrigue.dm
@@ -3,7 +3,7 @@
 	round_description = "Crewmembers are contacted by external elements while an outsider infiltrates the station."
 	extended_round_description = "Traitors and a ninja spawn during this round."
 	config_tag = "intrigue"
-	required_players = 15
+	required_players = 20
 	required_enemies = 3
 	end_on_antag_death = 0
 	antag_tags = list(MODE_NINJA, MODE_TRAITOR)
--- a/code/game/gamemodes/mixed/visitors.dm
+++ b/code/game/gamemodes/mixed/visitors.dm
@@ -3,7 +3,7 @@
 	round_description = "A space wizard and a ninja have invaded the station!"
 	extended_round_description = "A ninja and wizard spawn during this round."
 	config_tag = "visitors"
-	required_players = 15
+	required_players = 20
 	required_enemies = 3
 	end_on_antag_death = 0
 	antag_tags = list(MODE_WIZARD, MODE_NINJA)
--- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
@@ -267,6 +267,8 @@
 	new /obj/item/clothing/head/helmet/space/void/dominia(src)
 	new /obj/item/clothing/head/helmet/space/void/dominia(src)
 	new /obj/item/clothing/head/helmet/space/void/dominia(src)
+	new /obj/item/clothing/head/helmet/space/void/dominia(src)
+	new /obj/item/clothing/suit/space/void/dominia(src)
 	new /obj/item/clothing/suit/space/void/dominia(src)
 	new /obj/item/clothing/suit/space/void/dominia(src)
 	new /obj/item/clothing/suit/space/void/dominia(src)
@@ -285,3 +287,176 @@
 	new /obj/item/clothing/suit/space/void/dominia(src)
 	new /obj/item/melee/energy/sword/pirate(src)
 	new /obj/item/shield/energy/dominia(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/fill()
+	new /obj/item/clothing/under/tajaran/cosmonaut(src)
+	new /obj/item/clothing/under/tajaran/cosmonaut(src)
+	new /obj/item/clothing/under/tajaran/cosmonaut(src)
+	new /obj/item/clothing/under/tajaran/cosmonaut(src)
+	new /obj/item/clothing/under/tajaran/cosmonaut/commissar(src)
+	new /obj/item/clothing/head/tajaran/cosmonaut_commissar(src)
+	new /obj/item/rig/tesla/ninja(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/gun/projectile/automatic/rifle/adhomian(src)
+	new /obj/item/gun/projectile/automatic/rifle/adhomian(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/gun/energy/rifle/icelance(src)
+	new /obj/item/gun/projectile/pistol/adhomai(src)
+	new /obj/item/gun/projectile/pistol/adhomai(src)
+	new /obj/item/gun/projectile/pistol/adhomai(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/gun/projectile/deagle/adhomai(src)
+	new /obj/item/ammo_magazine/a50(src)
+	new /obj/item/ammo_magazine/a50(src)
+	new /obj/item/device/augment_implanter/advanced_tesla(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/kosmostrelki/single/fill()
+	new /obj/item/clothing/under/tajaran/cosmonaut(src)
+	new /obj/item/clothing/head/helmet/space/void/pra(src)
+	new /obj/item/clothing/suit/space/void/pra(src)
+	new /obj/item/gun/projectile/automatic/rifle/adhomian(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/gun/projectile/pistol/adhomai(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+
+//ninja stuff
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_sol/fill()
+	new /obj/item/rig/military/ninja(src)
+	new /obj/item/clothing/under/rank/fatigues/marine(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/automatic/rifle/sol(src)
+	new /obj/item/ammo_magazine/c762/sol(src)
+	new /obj/item/ammo_magazine/c762/sol(src)
+	new /obj/item/ammo_magazine/c762/sol(src)
+	new /obj/item/ammo_magazine/c762/sol(src)
+	new /obj/item/gun/projectile/pistol/sol(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_gunslinger/fill()
+	new /obj/item/rig/gunslinger/ninja(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/gauss(src)
+	new /obj/item/ammo_magazine/gauss(src)
+	new /obj/item/ammo_magazine/gauss(src)
+	new /obj/item/ammo_magazine/gauss(src)
+	new /obj/item/ammo_magazine/gauss(src)
+	new /obj/item/ammo_magazine/gauss/emp(src)
+	new /obj/item/gun/projectile/colt(src)
+	new /obj/item/ammo_magazine/c45m(src)
+	new /obj/item/ammo_magazine/c45m(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_breacher/fill()
+	new /obj/item/rig/unathi/fancy/ninja(src)
+	new /obj/item/melee/energy/sword/hegemony(src)
+	new /obj/item/shield/energy/hegemony(src)
+	new /obj/item/gun/energy/pistol/hegemony(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_tesla/fill()
+	new /obj/item/rig/tesla/ninja(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/automatic/rifle/adhomian(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/ammo_magazine/boltaction(src)
+	new /obj/item/gun/projectile/pistol/adhomai(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/device/augment_implanter/advanced_tesla(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_strike/fill()
+	new /obj/item/rig/strike/ninja(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/energy/rifle(src)
+	new /obj/item/gun/projectile/automatic/x9(src)
+	new /obj/item/ammo_magazine/c45x(src)
+	new /obj/item/ammo_magazine/c45x(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_jinxiang/fill()
+	new /obj/item/rig/jinxiang/ninja(src)
+	new /obj/item/melee/energy/sword/pirate(src)
+	new /obj/item/shield/energy/dominia(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/tanto(src)
+	new /obj/item/ammo_magazine/mc10mm(src)
+	new /obj/item/ammo_magazine/mc10mm(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_elyra/fill()
+	new /obj/item/rig/elyran/ninja(src)
+	new /obj/item/gun/projectile/plasma(src)
+	new /obj/item/ammo_magazine/plasma(src)
+	new /obj/item/ammo_magazine/plasma(src)
+	new /obj/item/ammo_magazine/plasma(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/pistol(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_hacker/fill()
+	new /obj/item/rig/light/hacker/ninja(src)
+	new /obj/item/gun/energy/xray(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/energy/crossbow/largecrossbow(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_techno/fill()
+	new /obj/item/rig/light/offworlder/techno/ninja(src)
+	new /obj/item/gun/projectile/automatic/rifle/sts35(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/pistol(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_crimson/fill()
+	new /obj/item/rig/merc/ninja(src)
+	new /obj/item/gun/projectile/automatic/c20r(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/ammo_magazine/a10mm(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/revolver(src)
+	new /obj/item/ammo_magazine/a357(src)
+	new /obj/item/ammo_magazine/a357(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/ninja_rhino/fill()
+	new /obj/item/rig/merc/distress/ninja(src)
+	new /obj/item/gun/projectile/automatic/rifle/sts35(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/ammo_magazine/c762(src)
+	new /obj/item/clothing/accessory/holster/armpit/brown(src)
+	new /obj/item/gun/projectile/pistol(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
+	new /obj/item/ammo_magazine/mc9mm(src)
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
@@ -21,7 +21,7 @@
 	confined_use = TRUE

 	use_power_cost = 75
-	active_power_cost = 5
+	active_power_cost = 15
 	passive_power_cost = 0
 	module_cooldown = 30

@@ -215,6 +215,25 @@
 		qdel(holder)
 	qdel(src)

+/obj/item/rig_module/anti_theft
+	name = "anti-theft system"
+	desc = "An advanced anti-theft system that tracks the user's lifesigns."
+	icon_state = "deadman"
+	usable = FALSE
+	active = FALSE
+	permanent = FALSE
+
+/obj/item/rig_module/anti_theft/process()
+	// Not being worn, leave it alone.
+	if(!holder || !holder.wearer || !holder.wearer.wear_suit == holder)
+		return FALSE
+
+	if(holder && holder.wearer.stat == DEAD)
+		holder.wearer.dust()
+		holder.wearer.drop_from_inventory(src)
+		qdel(holder)
+		qdel(src)
+
 /obj/item/rig_module/emp_shielding
 	name = "EMP dissipation module"
 	desc = "A bewilderingly complex bundle of fiber optics and chips. Seems like it uses a good deal of power."
--- a/code/modules/clothing/spacesuits/rig/modules/vision.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm
@@ -70,8 +70,7 @@
 	var/datum/rig_vision/vision
 	var/list/vision_modes = list(
 		/datum/rig_vision/nvg,
-		/datum/rig_vision/thermal,
-		/datum/rig_vision/meson
+		/datum/rig_vision/thermal
 		)

 	var/vision_index
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -155,7 +155,3 @@
 		/obj/item/rig_module/tesla_coil,
 		/obj/item/rig_module/mounted/tesla,
 		/obj/item/rig_module/device/door_hack)
-
-/obj/item/rig/tesla/ninja/Initialize()
-	. = ..()
-	new /obj/item/device/augment_implanter/advanced_tesla(get_turf(src))
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -123,13 +123,12 @@
 		/obj/item/rig_module/voice,
 		/obj/item/rig_module/power_sink,
 		/obj/item/rig_module/teleporter,
-		/obj/item/rig_module/stealth_field,
 		/obj/item/rig_module/electrowarfare_suite,
 		/obj/item/rig_module/ai_container,
 		/obj/item/rig_module/device/door_hack,
 		/obj/item/rig_module/datajack,
 		/obj/item/rig_module/chem_dispenser/ninja,
-		/obj/item/rig_module/self_destruct,
+		/obj/item/rig_module/anti_theft,
 		/obj/item/rig_module/actuators/combat
 	)

--- a/html/changelogs/example
+++ b/html/changelogs/example
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Alberyk
+
+delete-after: True
+
+changes:
+  - rscdel: "Removed the invisibility module from the ninja hardsuit."
+  - rscdel: "Removed the meson mode from the advanced vision hardsuit module."
+  - tweak: "Replaced the self destruct in the ninja rig with an anti-theft system that delets the user and the rig upon death. You can still buy the explosive option in the uplink." 
+  - tweak: "Increased the energy use of the invisibility hardsuit module." 
+  - rscadd: "Ninja hardsuit options are now similar to antag gear loadouts: they come with more stuff than just the hardsuit."
+  - tweak: "Increased the number of needed players in the intrigue and visitor game modes to 20."  
+  - rscadd: "Added a Kosmostrelki themed gear loadout."