[MIRROR] Ancient Milsim (very late) Anniversary Update (#5269)

* Ancient Milsim (very late) Anniversary Update (#4704) * tbd * Update anchor.dm * more stuff * even more stuff * Update choice_beacon.dm * almost forgot * Stuff for runners to barricade themselves with * Update choice_beacon.dm * i forgot to push stuff again * Update disks.dm * Apply suggestions from code review Co-authored-by: Bloop <[email protected]> * Update disks.dm --------- Co-authored-by: Bloop <[email protected]> * [MIRROR] Ancient Milsim (very late) Anniversary Update * Fix conflict --------- Co-authored-by: Stalkeros <[email protected]> Co-authored-by: Bloop <[email protected]> Co-authored-by: StealsThePRs <[email protected]> Co-authored-by: Feenie <[email protected]> Co-authored-by: Iajret <[email protected]>
Fluffy-Frontier · Jan 15, 2025 · c3a6afc · c3a6afc
1 parent fd6a260
commit c3a6afc
Show file tree

Hide file tree

Showing 10 changed files with 348 additions and 99 deletions.
diff --git a/_maps/virtual_domains/ancientmilsim_nova.dmm b/_maps/virtual_domains/ancientmilsim_nova.dmm
@@ -102,6 +102,10 @@
 /obj/effect/landmark/bitrunning/curiosity_spawn,
 /turf/open/floor/grass/fairy,
 /area/virtual_domain/protected_space/ancient_milsim)
+"ds" = (
+/obj/item/stack/sheet/mineral/sandbags/fifty,
+/turf/open/misc/grass/planet/ancient_milsim,
+/area/virtual_domain/ancient_milsim/loot_camp)
 "dB" = (
 /obj/effect/landmark/bitrunning/curiosity_spawn,
 /turf/open/misc/dirt/planet,
@@ -494,6 +498,9 @@
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/lanca,
+/obj/item/minespawner/ancient_milsim,
+/obj/item/minespawner/ancient_milsim,
+/obj/item/minespawner/ancient_milsim,
 /turf/open/floor/iron/dark,
 /area/virtual_domain/ancient_milsim/loot_camp)
 "ob" = (
@@ -510,6 +517,7 @@
 /turf/open/floor/plating,
 /area/virtual_domain/ancient_milsim/maintenance)
 "ol" = (
+/obj/item/automatic_turret_folded,
 /turf/open/floor/iron/dark,
 /area/virtual_domain/ancient_milsim/carrier)
 "or" = (
@@ -1078,6 +1086,10 @@
 /obj/item/storage/medkit/frontier/stocked,
 /turf/open/floor/iron/white,
 /area/virtual_domain/ancient_milsim/medbay)
+"Cj" = (
+/obj/item/storage/barricade,
+/turf/open/floor/iron/dark,
+/area/virtual_domain/ancient_milsim/loot_camp)
 "Cr" = (
 /obj/structure/chair/office/light{
 	dir = 4
@@ -1531,6 +1543,7 @@
 /area/virtual_domain/ancient_milsim/carrier)
 "My" = (
 /obj/structure/table,
+/obj/item/storage/barricade,
 /turf/open/floor/iron/dark,
 /area/virtual_domain/ancient_milsim/loot_camp)
 "Mz" = (
@@ -1743,6 +1756,9 @@
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/ammo_box/magazine/c35sol_pistol/stendo,
 /obj/item/stock_parts/matter_bin/super,
+/obj/item/minespawner/ancient_milsim,
+/obj/item/minespawner/ancient_milsim,
+/obj/item/minespawner/ancient_milsim,
 /turf/open/floor/iron/dark,
 /area/virtual_domain/ancient_milsim/loot_camp)
 "RC" = (
@@ -4183,7 +4199,7 @@ Uz
 "}
 (38,1,1) = {"
 Uz
-Vl
+ds
 Vl
 Vl
 TG
@@ -4360,7 +4376,7 @@ Uz
 TQ
 bB
 bB
-ki
+Cj
 vQ
 ki
 Ww

diff --git a/modular_nova/modules/bitrunning/code/anchor.dm b/modular_nova/modules/bitrunning/code/anchor.dm
@@ -0,0 +1,34 @@
+/obj/item/domain_anchor
+	name = "domain connection anchor"
+	desc = "A disposable tablet with a set of programs and utilities meant to stabilize the local square meter of domain infospace for new connections to be hopefully-safe. <br>\
+	In layman's terms, this creates additional bitrunning spawn points."
+	icon = 'modular_nova/modules/bitrunning/icons/remote.dmi'
+	icon_state = "delivery_running"
+
+/obj/item/domain_anchor/examine(mob/user)
+	. = ..()
+	. += span_notice("Use in-hand to create a new spawn point.")
+
+/obj/item/domain_anchor/attack_self(mob/user, modifiers)
+	for(var/obj/machinery/quantum_server/server in SSmachines.get_machines_by_type(/obj/machinery/quantum_server))
+		server.exit_turfs += get_turf(src)
+		server.retries_spent -= 1
+		server.threat += 1
+		server.radio.talk_into(src, "Potential secure datastream detected. Locking on the new spawn point.", RADIO_CHANNEL_SUPPLY)
+	new /obj/effect/landmark/bitrunning/domain_anchor(drop_location())
+	user.balloon_alert(user, "connection stabilized!")
+	qdel(src)
+
+/obj/effect/landmark/bitrunning/domain_anchor
+	name = "anchored secure connection"
+	desc = "Highly stable connection protocol, and consequentially a trojan, used by bitrunners during attacks on high-value targets when numbers are key and \
+	just three attempts aren't enough.<br>\
+	In several seconds it will merge itself with the code, becoming nigh-invisible to any means of detection."
+	icon = 'icons/effects/effects.dmi'
+	icon_state = "curse"
+	invisibility = INVISIBILITY_NONE
+
+/obj/effect/landmark/bitrunning/domain_anchor/Initialize(mapload)
+	. = ..()
+	animate(src, alpha = 0, 10 SECONDS)
+	QDEL_IN(src, 10 SECONDS)
diff --git a/modular_nova/modules/bitrunning/code/disks.dm b/modular_nova/modules/bitrunning/code/disks.dm
@@ -7,6 +7,7 @@
 		/datum/action/cooldown/spell/shapeshift/minor_illusion,
 		/datum/action/cooldown/spell/conjure_item/fire,
 		/datum/action/cooldown/spell/conjure_item/water,
+		/datum/action/cooldown/spell/conjure/cheese,
 	)
 
 /obj/item/bitrunning_disk/item/tier0
@@ -70,7 +71,7 @@
 /datum/orderable_item/bitrunning_tech/ability_tier0
 	cost_per_order = 350
 	purchase_path = /obj/item/bitrunning_disk/ability/tier0
-	desc = "This disk contains a program that lets you cast Minor Illusion, Conjure Presents!, Produce Flame, or Produce Water."
+	desc = "This disk contains a program that lets you cast Minor Illusion, Summon Cheese, Produce Flame, or Produce Water."
 
 /datum/orderable_item/bitrunning_tech/item_tier0
 	cost_per_order = 350
@@ -82,6 +83,7 @@
 	selectable_items = list(
 		/obj/item/summon_beacon/lustwish,
 		/obj/item/storage/box/nif_ghost_box,
+		/obj/item/storage/box/syndie_kit/chameleon/ghostcafe,
 	)
 
 /obj/item/summon_beacon/lustwish
@@ -112,12 +114,13 @@
 /datum/orderable_item/bitrunning_tech/item_tierlewd
 	cost_per_order = 250
 	purchase_path = /obj/item/bitrunning_disk/item/tierlewd
-	desc = "This disk contains a program that lets you equip a LustWish vending machine delivery beacon or a quick-booting NIF package."
+	desc = "This disk contains a program that lets you equip a LustWish vending machine delivery beacon, a quick-booting NIF package or a set of chameleon clothing."
 
 /obj/item/bitrunning_disk/item/tier1/Initialize(mapload)
 	. = ..()
 	selectable_items += list(
 		/obj/item/storage/belt/military,
+		/obj/item/book_of_babel,
 	)
 
 /obj/item/bitrunning_disk/item/tier2/Initialize(mapload)
@@ -127,40 +130,55 @@
 	)
 	selectable_items += list(
 		/obj/item/storage/toolbox/guncase/clandestine,
-		/obj/item/autosurgeon/syndicate/hackerman,
+		/obj/item/autosurgeon/syndicate/hackerman/bitrunning,
 		/obj/item/clothing/head/helmet,
 		/obj/item/melee/energy/sword/saber/blue,
+		/obj/item/shield/energy,
 		/obj/item/storage/medkit/expeditionary/surplus,
 	)
 
+/obj/item/autosurgeon/syndicate/hackerman/bitrunning
+	name = "hacking arm implanter"
+
 /obj/item/bitrunning_disk/item/tier3/Initialize(mapload)
 	. = ..()
 	selectable_items -= list(
 		/obj/item/gun/energy/e_gun/nuclear,
 	)
 	selectable_items += list(
-		/obj/item/autosurgeon/syndicate/nodrop,
+		/obj/item/domain_anchor,
+		/obj/item/autosurgeon/syndicate/nodrop/bitrunning,
 		/obj/item/gun/energy/modular_laser_rifle,
 		/obj/item/storage/belt/holster/energy/nanite,
 		/obj/item/minigunpack,
 	)
 
+/obj/item/autosurgeon/syndicate/nodrop/bitrunning
+	name = "anti-drop implanter"
+
 /obj/item/bitrunning_disk/ability/tier1/Initialize(mapload)
 	. = ..()
 	selectable_actions += list(
 		/datum/action/cooldown/spell/touch/lay_on_hands,
 		/datum/action/cooldown/spell/conjure/flare,
 	)
+	selectable_actions -= list(
+		/datum/action/cooldown/spell/conjure/cheese,
+	)
 
 /obj/item/bitrunning_disk/ability/tier2/Initialize(mapload)
 	. = ..()
 	selectable_actions += list(
 		/datum/action/cooldown/adrenaline,
 		/datum/action/cooldown/spell/charge,
 		/datum/action/cooldown/mob_cooldown/dash,
-		/datum/action/cooldown/spell/touch/scream_for_me,
+		/datum/action/cooldown/spell/touch/scream_for_me/bitrunning,
 	)
 
+/datum/action/cooldown/spell/touch/scream_for_me/bitrunning
+	name = "Unshackled Scream For Me"
+	spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC
+
 /obj/item/bitrunning_disk/ability/tier3/Initialize(mapload)
 	. = ..()
 	selectable_actions += list(
@@ -185,13 +203,13 @@
 	desc = "This disk contains a program that lets you equip a luxury medipen, a pistol case, an armour vest, a helmet, an energy sword, an expeditionary medkit, or a hacker implant."
 
 /datum/orderable_item/bitrunning_tech/item_tier3
-	desc = "This disk contains a program that lets you equip a Hyeseong laser rifle, a laser minigun pack, a nanite pistol holster, a dual bladed energy sword, a minibomb, or an anti-drop implanter."
+	desc = "This disk contains a program that lets you equip a domain connection anchor, Hyeseong laser rifle, a laser minigun pack, a nanite pistol holster, a dual bladed energy sword, a minibomb, or an anti-drop implanter."
 
 /datum/orderable_item/bitrunning_tech/ability_tier1
-	desc = "This disk contains a program that lets you cast Summon Cheese, Summon Light Source, Lesser Heal, or Mending Touch."
+	desc = "This disk contains a program that lets you cast Summon Light Source, Lesser Heal, or Mending Touch."
 
 /datum/orderable_item/bitrunning_tech/ability_tier2
-	desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, Scream For Me, Forcewall, Adrenaline Rush, Dash, or Charge Item."
+	desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, Unshackled Scream For Me, Forcewall, Adrenaline Rush, Dash, or Charge Item."
 
 /datum/orderable_item/bitrunning_tech/ability_tier3
 	desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, a polar bear, a holy juggernaut, or a holy wraith; or cast Death Loop."

diff --git a/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm b/modular_nova/modules/bitrunning/code/virtual_domains/ancient_milsim/choice_beacon.dm
@@ -1,6 +1,8 @@
 /obj/item/choice_beacon/ancient_milsim
 	name = "early access equipment beacon"
 	desc = "Summon a gear closet for your contributions in the early access testing. Synchronises with the current game version to give you the most up-to-date class equipment."
+	icon = 'modular_nova/modules/bitrunning/icons/remote.dmi'
+	icon_state = "delivery_dlc"
 	company_source = "'Time Of Valor 2' development team"
 	company_message = span_bold("Thanks, and have fun!")
 
@@ -12,41 +14,65 @@
 			gear_options[initial(crate.name)] = crate
 	return gear_options
 
+/obj/structure/closet/crate/secure/weapon/milsim
+	desc = "(ToV 2 Playtester Reward) UNIF Counter-Insurgency Detachment bundle: featuring equipment provided to field operators in medium-intensity firefights. <br>\
+	'VCIM (Void Combat Identification Measures) camo' Skin (Alt 1/Strobeless, Opaque Glass)."
+
+/obj/structure/closet/crate/secure/weapon/milsim/PopulateContents()
+	. = ..()
+	new /obj/item/knife/combat(src)
+	new /obj/item/gun/energy/modular_laser_rifle/carbine(src)
+	new /obj/item/radio/headset/headset_faction(src)
+
 /obj/structure/closet/crate/secure/weapon/milsim/after_open()
 	qdel(src)
 
 /obj/structure/closet/crate/secure/weapon/milsim/mechanic
-	name = "mechanic loadout crate"
+	name = "mechanic (abductor toolbelt/cable coil dispenser/medHUD)"
 
 /obj/structure/closet/crate/secure/weapon/milsim/mechanic/PopulateContents()
 	. = ..()
-	new /obj/item/knife/combat(src)
-	new /obj/item/gun/energy/modular_laser_rifle/carbine(src)
-	new /obj/item/mod/control/pre_equipped/responsory/milsim_mechanic(src)
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/mechanic(src)
 
 /obj/structure/closet/crate/secure/weapon/milsim/marksman
-	name = "marksman loadout crate"
+	name = "marksman (barricade box/throwing knife dispenser/NVG-sonar)"
 
 /obj/structure/closet/crate/secure/weapon/milsim/marksman/PopulateContents()
 	. = ..()
-	new /obj/item/knife/combat(src)
-	new /obj/item/gun/energy/modular_laser_rifle/carbine(src)
-	new /obj/item/mod/control/pre_equipped/responsory/milsim_marksman(src)
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/marksman(src)
 
 /obj/structure/closet/crate/secure/weapon/milsim/medic
-	name = "medic loadout crate"
+	name = "medic (combat hypospray/combat hypovials dispenser/medHUD)"
 
 /obj/structure/closet/crate/secure/weapon/milsim/medic/PopulateContents()
 	. = ..()
-	new /obj/item/knife/combat(src)
-	new /obj/item/gun/energy/modular_laser_rifle/carbine(src)
-	new /obj/item/mod/control/pre_equipped/responsory/milsim_medic(src)
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/medic(src)
 
 /obj/structure/closet/crate/secure/weapon/milsim/trapper
-	name = "trapper loadout crate"
+	name = "trapper (chameleon projector/stealth landmine dispenser/thermals)"
 
 /obj/structure/closet/crate/secure/weapon/milsim/trapper/PopulateContents()
 	. = ..()
-	new /obj/item/knife/combat(src)
-	new /obj/item/gun/energy/modular_laser_rifle/carbine(src)
-	new /obj/item/mod/control/pre_equipped/responsory/milsim_trapper(src)
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/trapper(src)
+
+/obj/structure/closet/crate/secure/weapon/milsim/saboteur
+	name = "saboteur (Binyat implanter/EMP grenade dispenser/material scanner-mesons)"
+
+/obj/structure/closet/crate/secure/weapon/milsim/saboteur/PopulateContents()
+	. = ..()
+	new /obj/item/clothing/glasses/material(src)
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/saboteur(src)
+
+/obj/structure/closet/crate/secure/weapon/milsim/sentinel
+	name = "sentinel (heavy machinegun/burger dispenser/NVG-sonar)"
+
+/obj/structure/closet/crate/secure/weapon/milsim/sentinel/PopulateContents()
+	. = ..()
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/sentinel(src)
+
+/obj/structure/closet/crate/secure/weapon/milsim/trooper
+	name = "trooper (Sol rifle/Sol rifle magazine dispenser/NVG-sonar)"
+
+/obj/structure/closet/crate/secure/weapon/milsim/trooper/PopulateContents()
+	. = ..()
+	new /obj/item/mod/control/pre_equipped/responsory/milsim/trooper(src)