diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 61c7ab2b31..b9456b98f1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -15,7 +15,6 @@ - Back - suitStorage - type: Wieldable - - type: GunRequiresWield - type: AmmoCounter - type: Gun fireRate: 5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 1a4aa7a8a5..762bb00c63 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -88,7 +88,7 @@ - type: entity name: C-20r sub machine gun - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] + parent: [BaseWeaponSubMachineGun] id: WeaponSubMachineGunC20r description: Manufactured by Cybersun-Armaments, the C-20r is one of the most popular personal small-arms in the Coalition of Colonies. Uses .35 auto ammo. components: @@ -101,13 +101,9 @@ map: ["enum.GunVisualLayers.Mag"] - type: Clothing sprite: Objects/Weapons/Guns/SMGs/c20r.rsi - - type: Wieldable - - type: GunWieldBonus - minAngle: -19 - maxAngle: -16 - type: Gun - minAngle: 21 - maxAngle: 32 + minAngle: 2 # WD EDIT + maxAngle: 10 # WD EDIT shotsPerBurst: 5 availableModes: - SemiAuto @@ -135,7 +131,7 @@ - type: entity name: Drozd - parent: [BaseWeaponSubMachineGun, BaseGunWieldable] + parent: [BaseWeaponSubMachineGun] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -148,13 +144,9 @@ map: ["enum.GunVisualLayers.Mag"] - type: Clothing sprite: Objects/Weapons/Guns/SMGs/drozd.rsi - - type: Wieldable - - type: GunWieldBonus - minAngle: -19 - maxAngle: -16 - type: Gun - minAngle: 21 - maxAngle: 32 + minAngle: 2 # WD EDIT + maxAngle: 14 # WD EDIT fireRate: 6 selectedMode: FullAuto soundGunshot: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index fc8bbd9315..d9f37c453f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -51,6 +51,7 @@ Blunt: 10 soundHit: collection: GenericHit + - type: GunRequiresWield # WD EDIT - type: entity name: Bulldog @@ -86,7 +87,6 @@ soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg fireOnDropChance: 0.3 - - type: Wieldable - type: ItemSlots slots: gun_magazine: @@ -133,7 +133,6 @@ shape: - 0,0,4,0 sprite: Objects/Weapons/Guns/Shotguns/db_shotgun_inhands_64x.rsi - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 2 fireOnDropChance: 0.5 @@ -170,7 +169,6 @@ sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi - type: BallisticAmmoProvider - type: Wieldable - - type: GunRequiresWield - type: entity parent: WeaponShotgunEnforcer @@ -195,7 +193,6 @@ sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi - type: Clothing sprite: Objects/Weapons/Guns/Shotguns/pump.rsi - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: BallisticAmmoProvider capacity: 4 - type: Tag @@ -278,7 +275,6 @@ - 0,0,4,0 - type: Sprite sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 2 fireOnDropChance: 1 @@ -303,7 +299,6 @@ shape: - 0,0,4,0 sprite: Objects/Weapons/Guns/Shotguns/improvised_shotgun_inhands_64x.rsi - - type: GunRequiresWield #remove when inaccuracy on spreads is fixed - type: Gun fireRate: 4 #No reason to stifle the firerate since you have to manually reload every time anyways. fireOnDropChance: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 6b63178366..771f3cfdbd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -110,7 +110,6 @@ - type: Gun fireRate: 0.6 - type: Wieldable - - type: GunRequiresWield - type: Telescope - type: MagazineVisuals magState: mag diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml index 4eec014f11..88e45f971f 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/special.yml @@ -18,10 +18,16 @@ fix1: shape: !type:PhysShapeAabb - bounds: "-0.5,-0.5,0.5,0.5" + bounds: "-0.5,-0.5,0.5,0.5" - type: Airtight noAirWhenFullyAirBlocked: false - type: Clickable - type: Tag tags: - - SpreaderIgnore + - SpreaderIgnore + # WD EDIT START + - type: Construction + graph: TinyFan + node: tinyFan + # WD EDIT END + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml index e0247001f2..d72834f084 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/drain.yml @@ -60,3 +60,8 @@ - !type:PlaySoundBehavior sound: collection: MetalBreak + # WD EDIT START + - type: Construction + graph: FloorDrain + node: floorDrain + # WD EDIT END \ No newline at end of file diff --git a/Resources/Prototypes/_White/Recipes/Construction/Graphs/utilities/atmos_advanced.yml b/Resources/Prototypes/_White/Recipes/Construction/Graphs/utilities/atmos_advanced.yml new file mode 100644 index 0000000000..a1891e6e30 --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Construction/Graphs/utilities/atmos_advanced.yml @@ -0,0 +1,62 @@ +- type: constructionGraph + id: TinyFan + start: start + graph: + - node: start + edges: + - to: tinyFan + steps: + - material: Steel + amount: 5 + - material: Silver + amount: 10 + doAfter: 4 + - node: tinyFan + entity: AtmosDeviceFanTiny + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:SpawnPrototype + prototype: IngotSilver1 + amount: 5 + - !type:DeleteEntity + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 5 + + +- type: constructionGraph + id: FloorDrain + start: start + graph: + - node: start + edges: + - to: floorDrain + steps: + - material: Steel + amount: 5 + - material: Silver + amount: 10 + doAfter: 4 + - node: floorDrain + entity: FloorDrain + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + - !type:SpawnPrototype + prototype: IngotSilver1 + amount: 5 + - !type:DeleteEntity + steps: + - tool: Screwing + doAfter: 2 + - tool: Welding + doAfter: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_White/Recipes/Crafting/utilities/atmos_advanced.yml b/Resources/Prototypes/_White/Recipes/Crafting/utilities/atmos_advanced.yml new file mode 100644 index 0000000000..7a7f3a6aca --- /dev/null +++ b/Resources/Prototypes/_White/Recipes/Crafting/utilities/atmos_advanced.yml @@ -0,0 +1,29 @@ +- type: construction + id: TinyFan + name: tiny fan + description: A tiny fan, releasing a thin gust of air. + category: construction-category-utilities + graph: TinyFan + startNode: start + targetNode: tinyFan + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: Structures/Piping/Atmospherics/tinyfan.rsi + state: icon + +- type: construction + id: FloorDrain + name: drain + description: Drains puddles around it. Useful for dumping mop buckets or keeping certain rooms clean. + category: construction-category-utilities + graph: FloorDrain + startNode: start + targetNode: floorDrain + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + icon: + sprite: Objects/Specific/Janitorial/drain.rsi + state: icon \ No newline at end of file