From ede43bed6457a59ae383728a3bdda75b36b78870 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 01:55:47 +0500 Subject: [PATCH 01/14] ASRS without acces (for SDMM) --- code/modules/reqs/_supply.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index 6eeb1a5cbee..cdeaf0a6911 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -224,6 +224,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /// Faction of the tablet var/faction = FACTION_TERRAGOV + /obj/item/supplytablet/crash + req_access = list() //So marines can access cargo stuff without relying on synth spawn + desc = "A tablet for an Automated Storage and Retrieval System. This version appears to be different from the one you usually see and does not require special access." + /obj/item/supplytablet/interact(mob/user) . = ..() if(.) From 2254c9afecf07a3ed036443057723568baee34bf Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 14:38:46 +0500 Subject: [PATCH 02/14] Undo ASRS --- code/modules/reqs/_supply.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index cdeaf0a6911..6eeb1a5cbee 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -224,10 +224,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /// Faction of the tablet var/faction = FACTION_TERRAGOV - /obj/item/supplytablet/crash - req_access = list() //So marines can access cargo stuff without relying on synth spawn - desc = "A tablet for an Automated Storage and Retrieval System. This version appears to be different from the one you usually see and does not require special access." - /obj/item/supplytablet/interact(mob/user) . = ..() if(.) From 6c7aa4bdf9774b3c22399a0b0be6cbaf77aa057b Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 15:32:38 +0500 Subject: [PATCH 03/14] Silo, ASRS and vendor change's --- .../machinery/vending/marine_vending.dm | 18 ++++++++++++------ code/modules/reqs/_supply.dm | 4 ++++ code/modules/xenomorph/silo.dm | 13 ++++++++----- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index abff9bd66a3..d702ae26e40 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -268,6 +268,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 +292,6 @@ /obj/item/ammo_magazine/rifle/dmr37 = -1, /obj/item/weapon/gun/rifle/sniper/antimaterial/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,14 +353,14 @@ /obj/item/explosive/grenade/m15 = 10, /obj/item/explosive/grenade/sticky = 25, /obj/item/explosive/grenade/incendiary = 50, + /obj/item/explosive/grenade/incendiary/sticky = 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/weapon/gun/flamer/big_flamer/marinestandard = 4, @@ -406,7 +407,6 @@ "Коробки" = 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, @@ -418,6 +418,11 @@ /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, @@ -425,6 +430,7 @@ /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/_supply.dm b/code/modules/reqs/_supply.dm index 6eeb1a5cbee..328e2462d99 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -224,6 +224,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /// Faction of the tablet var/faction = FACTION_TERRAGOV +/obj/item/supplytablet/crash + req_access = list() //So marines can access cargo stuff without relying on synth spawn + desc = "A tablet for an Automated Storage and Retrieval System. This version appears to be different from the one you usually see and somehow does not require special access." + /obj/item/supplytablet/interact(mob/user) . = ..() if(.) diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm index e00ede917c8..f6d373b932c 100644 --- a/code/modules/xenomorph/silo.dm +++ b/code/modules/xenomorph/silo.dm @@ -39,11 +39,12 @@ 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) - + if(!istype(src, /obj/structure/xeno/silo/crash)) + 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) + else + SSaura.add_emitter(src, AURA_XENO_RECOVERY, aura_radius, aura_strength, -1, FACTION_XENO, hivenumber) // Xenos will receive a slight increase in regeneration on almost entire map, because waiting a minute just to heal is bad, and regenerating in seconds in a crash does not allow the Marines to catch their breath. return INITIALIZE_HINT_LATELOAD /obj/structure/xeno/silo/LateInitialize() @@ -172,3 +173,5 @@ /obj/structure/xeno/silo/crash resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE | PLASMACUTTER_IMMUNE | INDESTRUCTIBLE + aura_strength = 2 + aura_radius = 50 From 46b76b65daef6b560048b6e6034313e6e9105967 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 15:45:10 +0500 Subject: [PATCH 04/14] Shuttle ASRS --- _maps/shuttles/tgs_bigbury.dmm | 6 +++++- _maps/shuttles/tgs_canterbury.dmm | 1 + code/game/objects/machinery/vending/marine_vending.dm | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm index 2265863c7f3..b98c20719e8 100644 --- a/_maps/shuttles/tgs_bigbury.dmm +++ b/_maps/shuttles/tgs_bigbury.dmm @@ -846,6 +846,10 @@ /obj/effect/landmark/start/job/crash/squadmarine, /turf/open/floor/mainship/mono, /area/shuttle/canterbury) +"Dp" = ( +/obj/item/supplytablet/crash, +/turf/open/floor/mainship/blue/full, +/area/shuttle/canterbury/cic) "DF" = ( /obj/effect/landmark/start/latejoin/crash, /turf/open/floor/mainship, @@ -1444,7 +1448,7 @@ Uo Uo ad bH -MY +Dp ao bD as diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm index 907f024dd2a..6e62ae4496a 100644 --- a/_maps/shuttles/tgs_canterbury.dmm +++ b/_maps/shuttles/tgs_canterbury.dmm @@ -57,6 +57,7 @@ /turf/open/floor/mainship/mono, /area/shuttle/canterbury/cic) "ak" = ( +/obj/item/supplytablet/crash, /turf/open/floor/mainship/blue/full, /area/shuttle/canterbury/cic) "am" = ( diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index d702ae26e40..13251b0c25d 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -353,7 +353,7 @@ /obj/item/explosive/grenade/m15 = 10, /obj/item/explosive/grenade/sticky = 25, /obj/item/explosive/grenade/incendiary = 50, - /obj/item/explosive/grenade/incendiary/sticky = 25, + /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, From 0ac3ca4974347b38908c30a4a9619b917ac080ad Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 15:47:51 +0500 Subject: [PATCH 05/14] Phero towers deleting --- code/datums/gamemodes/crash.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/datums/gamemodes/crash.dm b/code/datums/gamemodes/crash.dm index dc2df2e9f2c..677738c2a82 100644 --- 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() From a3c66b2f5cbd72997af4c800829dcf97e33fa426 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 15:51:17 +0500 Subject: [PATCH 06/14] MK88 HP box return --- code/game/objects/machinery/vending/marine_vending.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 13251b0c25d..39e5f6bdbf8 100644 --- 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, @@ -407,6 +408,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, From 4d75c8b40e8d211813c961178e861f18480f1eca Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Fri, 29 Nov 2024 16:01:51 +0500 Subject: [PATCH 07/14] Peperball ammo inf --- code/game/objects/machinery/vending/marine_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm index 39e5f6bdbf8..4378df448ae 100644 --- a/code/game/objects/machinery/vending/marine_vending.dm +++ b/code/game/objects/machinery/vending/marine_vending.dm @@ -363,7 +363,7 @@ ), "Специализированное" = list( /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, From 95e40c50bbffe717f1fcde813d8832de0e4bd8e3 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Sun, 1 Dec 2024 03:47:29 +0500 Subject: [PATCH 08/14] Bunch of fixes --- _maps/shuttles/tgs_bigbury.dmm | 10 +++++----- _maps/shuttles/tgs_canterbury.dmm | 7 ++++--- code/modules/reqs/_supply.dm | 4 ---- code/modules/xenomorph/silo.dm | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm index b98c20719e8..586e5f9227c 100644 --- a/_maps/shuttles/tgs_bigbury.dmm +++ b/_maps/shuttles/tgs_bigbury.dmm @@ -471,6 +471,10 @@ }, /area/shuttle/canterbury/cic) "bS" = ( +/obj/machinery/computer/supplycomp{ + req_access = list(); + resistance_flags = 67 + }, /turf/open/floor/mainship, /area/shuttle/canterbury/cic) "bT" = ( @@ -846,10 +850,6 @@ /obj/effect/landmark/start/job/crash/squadmarine, /turf/open/floor/mainship/mono, /area/shuttle/canterbury) -"Dp" = ( -/obj/item/supplytablet/crash, -/turf/open/floor/mainship/blue/full, -/area/shuttle/canterbury/cic) "DF" = ( /obj/effect/landmark/start/latejoin/crash, /turf/open/floor/mainship, @@ -1448,7 +1448,7 @@ Uo Uo ad bH -Dp +MY ao bD as diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm index 6e62ae4496a..c1725b85513 100644 --- a/_maps/shuttles/tgs_canterbury.dmm +++ b/_maps/shuttles/tgs_canterbury.dmm @@ -31,8 +31,10 @@ }, /area/shuttle/canterbury/cic) "ag" = ( -/obj/structure/table/mainship, -/obj/machinery/faxmachine/cic, +/obj/machinery/computer/supplycomp{ + req_access = list(); + resistance_flags = 67 + }, /turf/open/floor/mainship/blue{ dir = 1 }, @@ -57,7 +59,6 @@ /turf/open/floor/mainship/mono, /area/shuttle/canterbury/cic) "ak" = ( -/obj/item/supplytablet/crash, /turf/open/floor/mainship/blue/full, /area/shuttle/canterbury/cic) "am" = ( diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index 328e2462d99..6eeb1a5cbee 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -224,10 +224,6 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /// Faction of the tablet var/faction = FACTION_TERRAGOV -/obj/item/supplytablet/crash - req_access = list() //So marines can access cargo stuff without relying on synth spawn - desc = "A tablet for an Automated Storage and Retrieval System. This version appears to be different from the one you usually see and somehow does not require special access." - /obj/item/supplytablet/interact(mob/user) . = ..() if(.) diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm index f6d373b932c..9a1d51f8674 100644 --- a/code/modules/xenomorph/silo.dm +++ b/code/modules/xenomorph/silo.dm @@ -174,4 +174,4 @@ /obj/structure/xeno/silo/crash resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE | PLASMACUTTER_IMMUNE | INDESTRUCTIBLE aura_strength = 2 - aura_radius = 50 + aura_radius = 60 From 294896eb9c83f4bb0aa4f1c7ddc3ee02bbc3d343 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Sun, 1 Dec 2024 14:24:52 +0500 Subject: [PATCH 09/14] Crash supply console --- code/modules/reqs/_supply.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index 6eeb1a5cbee..cf3f61e8dce 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -253,6 +253,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /// 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 + resistance_flags = 67 + /obj/machinery/computer/supplycomp/interact(mob/user) . = ..() if(.) From 692960bde83029a74770648a9c35839fbe563231 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Sun, 1 Dec 2024 14:28:11 +0500 Subject: [PATCH 10/14] Console add on maps --- _maps/shuttles/tgs_bigbury.dmm | 5 +---- _maps/shuttles/tgs_canterbury.dmm | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm index 586e5f9227c..5f82d7892b0 100644 --- a/_maps/shuttles/tgs_bigbury.dmm +++ b/_maps/shuttles/tgs_bigbury.dmm @@ -471,10 +471,7 @@ }, /area/shuttle/canterbury/cic) "bS" = ( -/obj/machinery/computer/supplycomp{ - req_access = list(); - resistance_flags = 67 - }, +/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 index c1725b85513..80858bbab33 100644 --- a/_maps/shuttles/tgs_canterbury.dmm +++ b/_maps/shuttles/tgs_canterbury.dmm @@ -31,10 +31,7 @@ }, /area/shuttle/canterbury/cic) "ag" = ( -/obj/machinery/computer/supplycomp{ - req_access = list(); - resistance_flags = 67 - }, +/obj/machinery/computer/supplycomp/crash, /turf/open/floor/mainship/blue{ dir = 1 }, From a0e0bd989b72d521ac6d05d69d2cc0521a8e2318 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Sun, 1 Dec 2024 18:05:11 +0500 Subject: [PATCH 11/14] Flag RESIST ALL --- code/modules/reqs/_supply.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index cf3f61e8dce..d45c035fffa 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -255,7 +255,8 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /obj/machinery/computer/supplycomp/crash req_access = list() //So marines can access cargo stuff without relying on synth spawn - resistance_flags = 67 + 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) . = ..() From d856dfb1250c6001d0d2cc00f7bdc5c2d98ebdae Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Thu, 5 Dec 2024 21:55:12 +0500 Subject: [PATCH 12/14] Bunch of fixes --- code/modules/reqs/computer.dm | 5 +++++ code/modules/xenomorph/silo.dm | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/reqs/computer.dm b/code/modules/reqs/computer.dm index 7adbdd8b4d2..d8a60503b07 100644 --- 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 index 9a1d51f8674..8e173895433 100644 --- a/code/modules/xenomorph/silo.dm +++ b/code/modules/xenomorph/silo.dm @@ -39,12 +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() - if(!istype(src, /obj/structure/xeno/silo/crash)) - 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) - else - SSaura.add_emitter(src, AURA_XENO_RECOVERY, aura_radius, aura_strength, -1, FACTION_XENO, hivenumber) // Xenos will receive a slight increase in regeneration on almost entire map, because waiting a minute just to heal is bad, and regenerating in seconds in a crash does not allow the Marines to catch their breath. + 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() @@ -173,5 +170,3 @@ /obj/structure/xeno/silo/crash resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE | PLASMACUTTER_IMMUNE | INDESTRUCTIBLE - aura_strength = 2 - aura_radius = 60 From da7c78ebf9635b07db88442c4f06e2e0e5cc8d48 Mon Sep 17 00:00:00 2001 From: Helg2 <93882977+Helg2@users.noreply.github.com> Date: Thu, 5 Dec 2024 20:03:37 +0200 Subject: [PATCH 13/14] Update _supply.dm Signed-off-by: Helg2 <93882977+Helg2@users.noreply.github.com> --- code/modules/reqs/_supply.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reqs/_supply.dm b/code/modules/reqs/_supply.dm index dd025c2229f..8fac9089dcd 100644 --- a/code/modules/reqs/_supply.dm +++ b/code/modules/reqs/_supply.dm @@ -20,4 +20,4 @@ /datum/export_report/New(_points, _export_name, _faction) points = _points export_name = _export_name - faction = _faction \ No newline at end of file + faction = _faction From 8ad682126d07f6414ce18adca7a50a4fb2598720 Mon Sep 17 00:00:00 2001 From: CheBokJam Date: Sat, 7 Dec 2024 17:42:24 +0500 Subject: [PATCH 14/14] Crash pherotower del --- code/modules/xenomorph/xeno_towers.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/xenomorph/xeno_towers.dm b/code/modules/xenomorph/xeno_towers.dm index cd1ec6c8f6d..02e36cae797 100644 --- 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