Skip to content

Adds grenades properly to RnD, 9x39mm magazines, some remaps and fixes ordering on TAP and SRM jobs #1203

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

Open
KriegersMustDie wants to merge 12 commits into
base: master
Choose a base branch
from
+1,864 −1,784
Open

Adds grenades properly to RnD, 9x39mm magazines, some remaps and fixes ordering on TAP and SRM jobs #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0f3b044
The only pilot in Taypan to fly a Termite Mk2
KriegersMustDie Dec 2, 2025
f8f5310
USE CAMELCASE DAMN YOU
KriegersMustDie Dec 2, 2025
7af6c32
Yeah, that fits.
KriegersMustDie Dec 2, 2025
aef60db
what am i doing
KriegersMustDie Dec 2, 2025
7c1e416
de-RnD'd the Sasha
KriegersMustDie Dec 8, 2025
df16fd9
reOrder some jobs in the job selector
KriegersMustDie Dec 8, 2025
17a1075
rounding up the timelocks
KriegersMustDie Dec 8, 2025
6b7fff6
adds 9x39mm magazines to lathe and forge
KriegersMustDie Dec 8, 2025
48f6429
fixes bugs
KriegersMustDie Dec 8, 2025
ab03953
Merge branch 'master' into stefanKovatschIsTheOnlyGayInTaypan
KriegersMustDie Dec 8, 2025
6e47cda
Cheren is fixed. I test my PRs!
KriegersMustDie Dec 8, 2025
31447dc
Merge branch 'master' into stefanKovatschIsTheOnlyGayInTaypan
KriegersMustDie Jan 27, 2026
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
3,565 changes: 1,813 additions & 1,752 deletions Resources/Maps/_Crescent/Shuttles/NCWL/sasha.yml
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,6 +1270,7 @@
- MagazineHeavyRifle
- MagazineRifleDrum
- MagazineRifle
- MagazineCaselessRifle
- MagazineLightRifle
- MagazineShotgunSlug
- MagazineShotgun
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/_Crescent/Catalog/Fills/Belt/belt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,8 @@
- 0,0,7,1
- type: StorageFill
contents:
- id: ExGrenade
amount: 4
- id: SyndieMiniBomb
amount: 2
- id: RGD55M13Handgrenade
amount: 6
- id: EmpGrenade
amount: 2
- type: StaticPrice
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Entities/Objects/Weapons/smgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: NCWL DS3 Militant 9x39mm
parent: [BaseWeaponRifle, StreeCredRedeemable]
id: WeaponSubMachineGunMilitant
description: A 9x39 submachinegun designed for the NCWL internal police, comes with a huge supressor that makes it a pain in the ass to holster.
description: A 9x39 submachinegun designed for the NCWL internal police, comes with a huge suppressor that makes it a pain in the ass to holster.
components:
- type: Item
shape:
Expand Down
14 changes: 7 additions & 7 deletions Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/communardcrafts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,12 @@
completetime: 2
materials:
Cloth: 750
#- type: latheRecipe
# id: NCWLRGD55M13
# result: RGD55M13Hendgrenade
# completetime: 2
# materials:
# Plasma: 500
# Steel: 100

- type: latheRecipe
id: GrenadeNCWLRGD55M13
result: RGD55M13Handgrenade
completetime: 2
materials:
Plasma: 500
Steel: 100

7 changes: 7 additions & 0 deletions Resources/Prototypes/_Crescent/Entities/Recipes/Lathes/imperialcrafts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,3 +669,10 @@
Plasma: 500
Steel: 100

- type: latheRecipe
id: GrenadeDSMG3Stick
result: DSMG3StickHandgrenade
completetime: 2
materials:
Plasma: 500
Steel: 100
5 changes: 5 additions & 0 deletions Resources/Prototypes/_Crescent/Entities/Structures/lathe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@
- TimerTrigger
- EMPGrenadeElectronics
- GrenadeDSMG4Twistcap
- GrenadeDSMG3Stick
- GrenadeNCWLRGD55M13
- GrenadeSHIHG17Smart
- GrenadeNCSPRGD5
- DrumMagazineShotgunSlug
- DrumMagazineShotgunEmpty
- DrumMagazineShotgunBuck
Expand Down Expand Up @@ -297,6 +301,7 @@
- MagazineRifleDrum
- MagazineRifle
- MagazineLightRifle
- MagazineCaselessRifle
- MagazineShotgunSlug
- MagazineShotgun
- SpeedLoader127x99
Expand Down
11 changes: 6 additions & 5 deletions Resources/Prototypes/_Crescent/Research/communard.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
- WeaponSubMachineGunNCWLWatchdog
- ClothingOuterHardsuitNCWLInfantry
- WeaponShotgunProletar
- GrenadeNCWLRGD55M13

- type: technology
id: CommunardFighters
Expand All @@ -78,7 +79,7 @@
cost: 8000
recipeUnlocks:
- KrechetLPC

- type: technology
id: CommunardMolot
name: research-technology-communard-molot
Expand All @@ -90,7 +91,7 @@
cost: 8000
recipeUnlocks:
- MolotLPC

- type: technology
id: CommunardIvarod
name: research-technology-communard-ivarod
Expand All @@ -102,7 +103,7 @@
cost: 8000
recipeUnlocks:
- IvarodLPC

- type: technology
id: CommunardHind
name: research-technology-communard-corvette
Expand All @@ -114,7 +115,7 @@
cost: 8500
recipeUnlocks:
- HindLPC

- type: technology
id: CommunardGargut
name: research-technology-communard-carrier
Expand Down Expand Up @@ -240,4 +241,4 @@
cost: 15000
recipeUnlocks:
- NCWLKukri
- ClothingBeltSheathNCWLKukri
- ClothingBeltSheathNCWLKukri
1 change: 1 addition & 0 deletions Resources/Prototypes/_Crescent/Research/cyberdawn.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- WeaponRifleAkCyberdawn
- WeaponRifleKrinkovCyberdawn
- WeaponPistolViperWoodCyberdawn
- GrenadeNCSPRGD5

- type: technology
id: CyberdawnT1Infiltration
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_Crescent/Research/imperial.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
- WeaponSubMachineGunC20rImperial
- WeaponSniperDSMLegax
- WeaponPistolComplianceImperial
- GrenadeDSMG3Stick
- WeaponRevolverArgenti

- type: technology
Expand Down Expand Up @@ -269,6 +270,8 @@
- WeaponPistolNeoVolker
- WeaponLightMachineGunDSMDominion
- WeaponShotgunReno
- WeaponSniperDSMLegax
- GrenadeDSMG4Twistcap


- type: technology
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Crescent/Research/shinohara.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@
- WeaponLightMachineGunL6
- WeaponSniperHristov
- WeaponRifleBarghest
- GrenadeSHIHG17Smart

- type: technology
id: ShinoharaGrenadeLauncher
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/FourFamilies/draugr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: job-name-draugr
description: job-description-draugr
playTimeTracker: JobDraugrTAP
weight: 6
weight: 30
startingGear: DraugrGear
alwaysUseSpawner: true
requireAdminNotify: false
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/FourFamilies/servile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: job-name-servile
description: job-description-servile
playTimeTracker: JobServileTAP
weight: 50
weight: 10
startingGear: ServileGear
alwaysUseSpawner: true
requireAdminNotify: false
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_artificer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 1000
min: 7200
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_commandant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterOverallTimeRequirement
min: 35000
min: 36000
- !type:CharacterSpeciesRequirement
inverted: true
species:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_coordinator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 20000
min: 21600
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_director.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
species:
- Voidborn
- !type:CharacterOverallTimeRequirement
min: 20000
min: 21600
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterTraitRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_dockhand.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 1000
min: 7200
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_doctor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 1000
min: 7200
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_fleetkapitan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
requirements:
- !type:CharacterWhitelistRequirement
- !type:CharacterOverallTimeRequirement
min: 20000
min: 21600
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_kommissar.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
requirements:
- !type:CharacterWhitelistRequirement
- !type:CharacterOverallTimeRequirement
min: 30000
min: 32400
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdgrunt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 20000
min: 21600
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_mvdofficer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
requirements:
- !type:CharacterWhitelistRequirement
- !type:CharacterOverallTimeRequirement
min: 30000
min: 32400
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_partisan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterOverallTimeRequirement
min: 1000
min: 7200
- !type:CharacterSpeciesRequirement
inverted: true
species:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/NCWL/ncwl_taskmaster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
canBeAntag: false
requirements:
- !type:CharacterOverallTimeRequirement
min: 20000
min: 21600
- !type:FactionRequirement
factionID: "NCWL"
- !type:CharacterSpeciesRequirement
Expand Down
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Crescent/Roles/Jobs/SRM/overseer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
name: job-name-overseer
description: job-description-overseer
playTimeTracker: JobOverseerSRM
weight: 99
weight: 101
startingGear: OverseerGear
alwaysUseSpawner: true
requireAdminNotify: false
Expand All @@ -12,6 +12,8 @@
canBeAntag: false
requirements:
- !type:CharacterWhitelistRequirement
- !type:CharacterOverallTimeRequirement
min: 40000
- !type:FactionRequirement
factionID: "SRM"
- !type:CharacterSpeciesRequirement
Expand Down
Loading