Crash tweaks (#727)

* ASRS without acces (for SDMM) * Undo ASRS * Silo, ASRS and vendor change's * Shuttle ASRS * Phero towers deleting * MK88 HP box return * Peperball ammo inf * Bunch of fixes * Crash supply console * Console add on maps * Flag RESIST ALL * Bunch of fixes * Update _supply.dm Signed-off-by: Helg2 <[email protected]> * Crash pherotower del --------- Signed-off-by: CheBokJam <[email protected]> Signed-off-by: Helg2 <[email protected]> Co-authored-by: Helg2 <[email protected]>
PMC-Unga-Marines · Dec 9, 2024 · 46a24d5 · 46a24d5
1 parent 2ec34b5
commit 46a24d5
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 25 deletions.
diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm
@@ -471,6 +471,7 @@
 	},
 /area/shuttle/canterbury/cic)
 "bS" = (
+/obj/machinery/computer/supplycomp/crash,
 /turf/open/floor/mainship,
 /area/shuttle/canterbury/cic)
 "bT" = (

diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm
@@ -31,8 +31,7 @@
 	},
 /area/shuttle/canterbury/cic)
 "ag" = (
-/obj/structure/table/mainship,
-/obj/machinery/faxmachine/cic,
+/obj/machinery/computer/supplycomp/crash,
 /turf/open/floor/mainship/blue{
 	dir = 1
 	},

diff --git a/code/datums/gamemodes/crash.dm b/code/datums/gamemodes/crash.dm
@@ -84,14 +84,7 @@
 /datum/game_mode/infestation/crash/post_setup()
 	. = ..()
 	for(var/i in GLOB.xeno_resin_silo_turfs)
-		//RUTGMC EDIT BEGIN
-		/* //ORIGINAL
-		new /obj/structure/xeno/silo(i)
-		new /obj/structure/xeno/pherotower(i)
-		*/
 		new /obj/structure/xeno/silo/crash(i)
-		new /obj/structure/xeno/pherotower/crash(i)
-		//RUTGMC EDIT END
 
 	for(var/obj/effect/landmark/corpsespawner/corpse AS in GLOB.corpse_landmarks_list)
 		corpse.create_mob()

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -182,6 +182,7 @@
 		"Коробки" = list(
 			/obj/item/ammo_magazine/packet/p9mm = -1,
 			/obj/item/ammo_magazine/packet/p9mm/ap = -1,
+			/obj/item/ammo_magazine/packet/p9mm/hp = -1,
 			/obj/item/ammo_magazine/packet/acp = -1,
 			/obj/item/ammo_magazine/packet/acp/ap = -1,
 			/obj/item/ammo_magazine/packet/acp/hp = -1,
@@ -268,6 +269,9 @@
 			/obj/item/ammo_magazine/rifle/ar21 = -1,
 			/obj/item/ammo_magazine/rifle/ar21/ap = -1,
 			/obj/item/ammo_magazine/rifle/ar21/hp = -1,
+			/obj/item/weapon/gun/revolver/r44/coltrifle = -1,
+			/obj/item/ammo_magazine/revolver/rifle = -1,
+
 		),
 		"Пистолеты-пулемёты" = list(
 			/obj/item/weapon/gun/smg/vector = -1,
@@ -289,8 +293,6 @@
 			/obj/item/ammo_magazine/rifle/dmr37 = -1,
 			/obj/item/weapon/gun/rifle/sr127= -1,
 			/obj/item/ammo_magazine/rifle/sr127 = -1,
-			/obj/item/weapon/gun/revolver/r44/coltrifle = -1,
-			/obj/item/ammo_magazine/revolver/rifle = -1,
 			/obj/item/weapon/gun/rifle/sniper/svd = -1,
 			/obj/item/ammo_magazine/sniper/svd = -1,
 		),
@@ -352,16 +354,16 @@
 			/obj/item/explosive/grenade/m15 = 10,
 			/obj/item/explosive/grenade/sticky = 25,
 			/obj/item/explosive/grenade/incendiary = 50,
+			/obj/item/explosive/grenade/sticky/trailblazer = 25,
 			/obj/item/explosive/grenade/smokebomb/cloak = 25,
 			/obj/item/explosive/grenade/smokebomb/drain = 10,
 			/obj/item/explosive/grenade/mirage = 100,
-			/obj/item/storage/box/m94 = 200,
-			/obj/item/storage/box/m94/cas = 50,
+			/obj/item/storage/box/m94 = -1,
+			/obj/item/storage/box/m94/cas = -1,
 		),
 		"Специализированное" = list(
-			/obj/item/cell/lasgun/lasrifle = -1,
 			/obj/item/weapon/gun/rifle/pepperball = 4,
-			/obj/item/ammo_magazine/rifle/pepperball = 40,
+			/obj/item/ammo_magazine/rifle/pepperball = -1,
 			/obj/item/weapon/gun/flamer/big_flamer/marinestandard = 4,
 			/obj/item/ammo_magazine/flamer_tank/large = 30,
 			/obj/item/ammo_magazine/flamer_tank/large/G = 15,
@@ -418,13 +420,19 @@
 			/obj/item/ammo_magazine/packet/t500/slavs = -1,
 			/obj/item/ammo_magazine/packet/p10x20mm = -1,
 			/obj/item/ammo_magazine/packet/p10x24mm = -1,
+			/obj/item/ammo_magazine/packet/p10x24mm/ap = -1,
+			/obj/item/ammo_magazine/packet/p10x24mm/hp = -1,
+			/obj/item/ammo_magazine/packet/p10x25mm = -1,
+			/obj/item/ammo_magazine/packet/p10x25mm/ap = -1,
+			/obj/item/ammo_magazine/packet/p10x25mm/hp = -1,
 			/obj/item/ammo_magazine/packet/groza = -1,
 			/obj/item/ammo_magazine/packet/groza/ap = -1,
 			/obj/item/ammo_magazine/packet/groza/hp = -1,
 			/obj/item/ammo_magazine/packet/p10x25mm = -1,
 			/obj/item/ammo_magazine/packet/p10x26mm = -1,
 			/obj/item/ammo_magazine/packet/p10x27mm = -1,
 			/obj/item/ammo_magazine/packet/p86x70mm = -1,
+			/obj/item/ammo_magazine/packet/svd762x54mmR = -1,
 			/obj/item/ammo_magazine/packet/standardautoshotgun = -1,
 			/obj/item/ammo_magazine/packet/standardautoshotgun/flechette = -1,
 			/obj/item/ammo_magazine/packet/p4570 = -1,

diff --git a/code/modules/reqs/computer.dm b/code/modules/reqs/computer.dm
@@ -14,6 +14,11 @@
 	/// Faction of the computer
 	var/faction = FACTION_TERRAGOV
 
+/obj/machinery/computer/supplycomp/crash
+	req_access = list() //So marines can access cargo stuff without relying on synth spawn
+	desc = "A console for an Automated Storage and Retrieval System. This version somehow does not require special access."
+	resistance_flags = RESIST_ALL
+
 /obj/machinery/computer/supplycomp/interact(mob/user)
 	. = ..()
 	if(.)

diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm
@@ -39,11 +39,9 @@
 		SSspawning.spawnerdata[src].required_increment = 2 * max(45 SECONDS, 3 MINUTES - SSmonitor.maximum_connected_players_count * SPAWN_RATE_PER_PLAYER)/SSspawning.wait
 		SSspawning.spawnerdata[src].max_allowed_mobs = max(1, MAX_SPAWNABLE_MOB_PER_PLAYER * SSmonitor.maximum_connected_players_count * 0.5)
 	update_minimap_icon()
-
 	SSaura.add_emitter(src, AURA_XENO_RECOVERY, aura_radius, aura_strength, -1, FACTION_XENO, hivenumber)
 	SSaura.add_emitter(src, AURA_XENO_WARDING, aura_radius, aura_strength, -1, FACTION_XENO, hivenumber)
 	SSaura.add_emitter(src, AURA_XENO_FRENZY, aura_radius, aura_strength, -1, FACTION_XENO, hivenumber)
-
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/structure/xeno/silo/LateInitialize()

diff --git a/code/modules/xenomorph/xeno_towers.dm b/code/modules/xenomorph/xeno_towers.dm
@@ -107,11 +107,3 @@
 		if(AURA_XENO_FRENZY)
 			icon_state = "frenzytower"
 			set_light(2, 2, LIGHT_COLOR_RED)
-
-/obj/structure/xeno/pherotower/crash
-	name = "Recovery tower"
-	resistance_flags = RESIST_ALL
-	xeno_structure_flags = IGNORE_WEED_REMOVAL | CRITICAL_STRUCTURE
-
-/obj/structure/xeno/pherotower/crash/attack_alien(isrightclick = FALSE)
-	return