Skip to content

Commit

Permalink
Rubbers
Browse files Browse the repository at this point in the history
  • Loading branch information
dvir001 committed Apr 12, 2024
1 parent 4f4b638 commit c043e7b
Show file tree
Hide file tree
Showing 8 changed files with 293 additions and 0 deletions.
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
contents:
- id: WeaponRevolverInspector
- id: SpeedLoaderMagnum
- id: SpeedLoaderMagnumRubber

- type: entity
id: ClothingBeltChefFilled
Expand Down
18 changes: 18 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,15 @@
- ClothingOuterHardsuitSyndicate
# Frontier End
emagDynamicRecipes:
- CartridgePistolRubber
- CartridgeMagnumRubber
- ShellShotgunBeanbag
- CartridgeRifleRubber
- CartridgeLightRifleRubber
- MagazineBoxPistolRubber
- MagazineBoxMagnumRubber
- MagazineBoxRifleRubber
- MagazineBoxLightRifleRubber
- ShellShotgunIncendiary
- CartridgePistolIncendiary
- CartridgeMagnumIncendiary
Expand Down Expand Up @@ -764,6 +772,11 @@
- CartridgeMagnumUranium
- CartridgePistolUranium
- CartridgeRifleUranium
- CartridgeLightRifleRubber
- CartridgeMagnumRubber
- CartridgePistolRubber
- CartridgeRifleRubber
- ClothingEyesGlassesSecurity
- ExplosivePayload
- FlashPayload
- HoloprojectorSecurity
Expand All @@ -775,9 +788,14 @@
- MagazineBoxMagnumUranium
- MagazineBoxPistolUranium
- MagazineBoxRifleUranium
- MagazineBoxLightRifleRubber
- MagazineBoxMagnumRubber
- MagazineBoxPistolRubber
- MagazineBoxRifleRubber
- MagazineGrenadeEmpty
- GrenadeEMP
- GrenadeFlash
- ShellShotgunBeanbag
- ShellShotgunIncendiary
- ShellShotgunUranium
- Signaller
Expand Down
72 changes: 72 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,24 @@
Plastic: 15
Steel: 10

- type: latheRecipe
id: CartridgePistolRubber
result: CartridgePistolRubber
category: Ammo
completetime: 2
materials:
Plastic: 5
Steel: 5

- type: latheRecipe
id: CartridgeMagnumRubber
result: CartridgeMagnumRubber
category: Ammo
completetime: 2
materials:
Plastic: 5
Steel: 5

- type: latheRecipe
id: CartridgeRifle
result: CartridgeRifle
Expand All @@ -146,6 +164,24 @@
materials:
Steel: 15

- type: latheRecipe
id: CartridgeLightRifleRubber
result: CartridgeLightRifleRubber
category: Ammo
completetime: 2
materials:
Plastic: 10
Steel: 5

- type: latheRecipe
id: CartridgeRifleRubber
result: CartridgeRifleRubber
category: Ammo
completetime: 2
materials:
Plastic: 10
Steel: 5

- type: latheRecipe
id: CartridgePistol
result: CartridgePistol
Expand Down Expand Up @@ -262,6 +298,15 @@
materials:
Steel: 650

- type: latheRecipe
id: MagazineBoxPistolRubber
result: MagazineBoxPistolRubber
category: Ammo
completetime: 5
materials:
Steel: 350
Plastic: 300

- type: latheRecipe
id: MagazineBoxMagnum
result: MagazineBoxMagnum
Expand All @@ -270,6 +315,15 @@
materials:
Steel: 1250

- type: latheRecipe
id: MagazineBoxMagnumRubber
result: MagazineBoxMagnumRubber
category: Ammo
completetime: 5
materials:
Steel: 350
Plastic: 300

- type: latheRecipe
id: MagazineRifle
result: MagazineRifle
Expand All @@ -294,6 +348,15 @@
materials:
Steel: 950

- type: latheRecipe
id: MagazineBoxRifleRubber
result: MagazineBoxRifleRubber
category: Ammo
completetime: 5
materials:
Steel: 350
Plastic: 600

- type: latheRecipe
id: MagazineBoxLightRifle
result: MagazineBoxLightRifle
Expand All @@ -302,6 +365,15 @@
materials:
Steel: 1800

- type: latheRecipe
id: MagazineBoxLightRifleRubber
result: MagazineBoxLightRifleRubber
category: Ammo
completetime: 5
materials:
Steel: 350
Plastic: 600

- type: latheRecipe
id: SpeedLoaderMagnum
result: SpeedLoaderMagnum
Expand Down
20 changes: 20 additions & 0 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,26 @@
recipeUnlocks:
- WeaponLaserCarbine

- type: technology
id: NonlethalAmmunition
name: research-technology-nonlethal-ammunition
icon:
sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
state: beanbag
discipline: Arsenal
tier: 1
cost: 5000
recipeUnlocks:
- ShellShotgunBeanbag
- CartridgePistolRubber
- CartridgeMagnumRubber
- CartridgeLightRifleRubber
- CartridgeRifleRubber
- MagazineBoxPistolRubber
- MagazineBoxMagnumRubber
- MagazineBoxLightRifleRubber
- MagazineBoxRifleRubber

- type: technology
id: UraniumMunitions
name: research-technology-uranium-munitions
Expand Down
58 changes: 58 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# - type: job
# id: HeadOfSecurity
# name: job-name-hos
# description: job-description-hos
# playTimeTracker: JobHeadOfSecurity
# requirements:
# - !type:RoleTimeRequirement
# role: JobWarden
# time: 10800 #3 hrs
# - !type:RoleTimeRequirement
# role: JobSecurityOfficer
# time: 36000 #10 hrs
# - !type:DepartmentTimeRequirement
# department: Security
# time: 108000 # 30 hrs
# - !type:OverallPlaytimeRequirement
# time: 144000 #40 hrs
# weight: 10
# startingGear: HoSGear
# icon: "JobIconHeadOfSecurity"
# requireAdminNotify: true
# supervisors: job-supervisors-captain
# canBeAntag: false
# access:
# - HeadOfSecurity
# - Command
# - Brig
# - Security
# - Armory
# - Maintenance
# - Service
# - External
# - Detective
# - Cryogenics
# special:
# - !type:AddImplantSpecial
# implants: [ MindShieldImplant ]
# - !type:AddComponentSpecial
# components:
# - type: CommandStaff

# - type: startingGear
# id: HoSGear
# equipment:
# jumpsuit: ClothingUniformJumpsuitHoS
# back: ClothingBackpackHOSFilled
# shoes: ClothingShoesBootsCombatFilled
# outerClothing: ClothingOuterCoatHoSTrench
# eyes: ClothingEyesGlassesSunglasses
# head: ClothingHeadHatBeretHoS
# id: HoSPDA
# gloves: ClothingHandsGlovesCombat
# ears: ClothingHeadsetAltSecurity
# belt: ClothingBeltSecurityFilled
# pocket1: WeaponPistolMk58Nonlethal
# innerClothingSkirt: ClothingUniformJumpskirtHoS
# satchel: ClothingBackpackSatchelHOSFilled
# duffelbag: ClothingBackpackDuffelHOSFilled
42 changes: 42 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# - type: job
# id: SecurityCadet
# name: job-name-cadet
# description: job-description-cadet
# playTimeTracker: JobSecurityCadet
# requirements:
# - !type:OverallPlaytimeRequirement
# time: 36000 #10 hrs
# - !type:DepartmentTimeRequirement
# department: Security
# time: 54000 #15 hrs
# inverted: true # stop playing intern if you're good at security!
# startingGear: SecurityCadetGear
# icon: "JobIconSecurityCadet"
# supervisors: job-supervisors-security
# canBeAntag: false
# access:
# - Security
# - Brig
# - Maintenance
# - Service
# - External
# - Cryogenics
# special:
# - !type:AddImplantSpecial
# implants: [ MindShieldImplant ]

# - type: startingGear
# id: SecurityCadetGear
# equipment:
# jumpsuit: ClothingUniformJumpsuitColorRed
# back: ClothingBackpackSecurityFilled
# shoes: ClothingShoesBootsCombatFilled
# outerClothing: ClothingOuterArmorBasic
# id: SecurityCadetPDA
# ears: ClothingHeadsetSecurity
# belt: ClothingBeltSecurityFilled
# pocket1: WeaponPistolMk58Nonlethal
# pocket2: BookSecurity
# innerClothingSkirt: ClothingUniformJumpskirtColorRed
# satchel: ClothingBackpackSatchelSecurityFilled
# duffelbag: ClothingBackpackDuffelSecurityFilled
40 changes: 40 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# - type: job
# id: SecurityOfficer
# name: job-name-security
# description: job-description-security
# playTimeTracker: JobSecurityOfficer
# requirements:
# - !type:DepartmentTimeRequirement
# department: Security
# time: 36000 #10 hrs
# startingGear: SecurityOfficerGear
# icon: "JobIconSecurityOfficer"
# supervisors: job-supervisors-hos
# canBeAntag: false
# access:
# - Security
# - Brig
# - Maintenance
# - Service
# - External
# - Cryogenics
# special:
# - !type:AddImplantSpecial
# implants: [ MindShieldImplant ]

# - type: startingGear
# id: SecurityOfficerGear
# equipment:
# jumpsuit: ClothingUniformJumpsuitSec
# back: ClothingBackpackSecurityFilled
# shoes: ClothingShoesBootsCombatFilled
# eyes: ClothingEyesGlassesSunglasses
# head: ClothingHeadHelmetBasic
# outerClothing: ClothingOuterArmorBasic
# id: SecurityPDA
# ears: ClothingHeadsetSecurity
# belt: ClothingBeltSecurityFilled
# pocket1: WeaponPistolMk58Nonlethal
# innerClothingSkirt: ClothingUniformJumpskirtSec
# satchel: ClothingBackpackSatchelSecurityFilled
# duffelbag: ClothingBackpackDuffelSecurityFilled
42 changes: 42 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# - type: job
# id: Warden
# name: job-name-warden
# description: job-description-warden
# playTimeTracker: JobWarden
# requirements:
# - !type:RoleTimeRequirement
# role: JobSecurityOfficer
# time: 36000 #10 hrs
# startingGear: WardenGear
# icon: "JobIconWarden"
# supervisors: job-supervisors-hos
# canBeAntag: false
# access:
# - Security
# - Brig
# - Armory
# - Maintenance
# - Service
# - External
# - Detective
# - Cryogenics
# special:
# - !type:AddImplantSpecial
# implants: [ MindShieldImplant ]

# - type: startingGear
# id: WardenGear
# equipment:
# head: ClothingHeadHatWarden
# jumpsuit: ClothingUniformJumpsuitWarden
# back: ClothingBackpackSecurityFilled
# shoes: ClothingShoesBootsCombatFilled
# eyes: ClothingEyesGlassesSunglasses
# outerClothing: ClothingOuterCoatWarden
# id: WardenPDA
# ears: ClothingHeadsetSecurity
# belt: ClothingBeltSecurityFilled
# pocket1: WeaponPistolMk58Nonlethal
# innerClothingSkirt: ClothingUniformJumpskirtWarden
# satchel: ClothingBackpackSatchelSecurityFilled
# duffelbag: ClothingBackpackDuffelSecurityFilled

0 comments on commit c043e7b

Please sign in to comment.