Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crash tweaks #727

Merged
merged 18 commits into from
Dec 9, 2024
+21 −25
Merged

Crash tweaks #727

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ede43be
ASRS without acces (for SDMM)
CheBokJam Nov 28, 2024
4482f4d
Merge branch 'master' of https://github.com/CheBokJam/Unga-MarinesTestxd
CheBokJam Nov 28, 2024
90bb0fc
Merge branch 'master' of https://github.com/CheBokJam/Unga-MarinesTestxd
CheBokJam Nov 28, 2024
2254c9a
Undo ASRS
CheBokJam Nov 29, 2024
6c7aa4b
Silo, ASRS and vendor change's
CheBokJam Nov 29, 2024
46b76b6
Shuttle ASRS
CheBokJam Nov 29, 2024
0ac3ca4
Phero towers deleting
CheBokJam Nov 29, 2024
a3c66b2
MK88 HP box return
CheBokJam Nov 29, 2024
4d75c8b
Peperball ammo inf
CheBokJam Nov 29, 2024
95e40c5
Bunch of fixes
CheBokJam Nov 30, 2024
294896e
Crash supply console
CheBokJam Dec 1, 2024
692960b
Console add on maps
CheBokJam Dec 1, 2024
a0e0bd9
Flag RESIST ALL
CheBokJam Dec 1, 2024
2be0d75
Merge branch 'master' into Crash-change
CheBokJam Dec 5, 2024
d856dfb
Bunch of fixes
CheBokJam Dec 5, 2024
da7c78e
Update _supply.dm
Helg2 Dec 5, 2024
8ad6821
Crash pherotower del
CheBokJam Dec 7, 2024
8c47e00
Merge branch 'Crash-change' of https://github.com/CheBokJam/Unga-Mari…
CheBokJam Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _maps/shuttles/tgs_bigbury.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,7 @@
},
/area/shuttle/canterbury/cic)
"bS" = (
/obj/machinery/computer/supplycomp/crash,
/turf/open/floor/mainship,
/area/shuttle/canterbury/cic)
"bT" = (
Expand Down
3 changes: 1 addition & 2 deletions _maps/shuttles/tgs_canterbury.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
7 changes: 0 additions & 7 deletions code/datums/gamemodes/crash.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
CheBokJam marked this conversation as resolved.
Show resolved Hide resolved

for(var/obj/effect/landmark/corpsespawner/corpse AS in GLOB.corpse_landmarks_list)
corpse.create_mob()
Expand Down
20 changes: 14 additions & 6 deletions code/game/objects/machinery/vending/marine_vending.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -289,8 +293,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,
),
Expand Down Expand Up @@ -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,
Helg2 marked this conversation as resolved.
Show resolved Hide resolved
),
"Специализированное" = 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,
Expand Down Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions code/modules/reqs/_supply.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Helg2 marked this conversation as resolved.
Show resolved Hide resolved

/obj/machinery/computer/supplycomp/interact(mob/user)
. = ..()
if(.)
Expand Down
13 changes: 8 additions & 5 deletions code/modules/xenomorph/silo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -172,3 +173,5 @@

/obj/structure/xeno/silo/crash
resistance_flags = UNACIDABLE | DROPSHIP_IMMUNE | PLASMACUTTER_IMMUNE | INDESTRUCTIBLE
aura_strength = 2
aura_radius = 60
Loading