Dragon

Content.Client/Weapons/Melee/MeleeWeaponSystem.cs

@@ -9,6 +9,7 @@
 using Content.Shared.Weapons.Melee;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
+using Content.Shared.Wieldable.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -94,11 +95,27 @@ public override void Update(float frameTime)
         // it's kinda tricky.
         // I think as long as we make secondaries their own component it's probably fine
         // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
-        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
-        {
-            return;
+        //if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
+        //{
+        //    return;
+        //}
+        // Floof changes from frontier
+        bool gunBoundToUse = false;
+        bool gunBoundToAlt = false;
+
+        if (TryComp<GunComponent>(weaponUid, out var gun)) {
+            gunBoundToUse = gun.UseKey;
+            gunBoundToAlt = !gun.UseKey; //Bound to alt-use when false
+
+            // If ranged mode only works when wielded, do not block melee attacks when unwielded
+            // (e.g. crusher & crusher glaive)
+            if (TryComp<GunRequiresWieldComponent>(weaponUid, out var _) &&
+                TryComp<WieldableComponent>(weaponUid, out var wield)) {
+                gunBoundToUse &= wield.Wielded;
+                gunBoundToAlt &= wield.Wielded;
+            }
         }
-
+        // End Floof changes
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
         if (mousePos.MapId == MapId.Nullspace)
@@ -118,7 +135,7 @@ public override void Update(float frameTime)
         }
 
         // Heavy attack.
-        if (altDown == BoundKeyState.Down)
+        if (altDown == BoundKeyState.Down && !gunBoundToAlt) //Floof: add !gunBoundToAlt condition
         {
             // If it's an unarmed attack then do a disarm
             if (weapon.AltDisarm && weaponUid == entity)
@@ -139,7 +156,7 @@ public override void Update(float frameTime)
         }
 
         // Light attack
-        if (useDown == BoundKeyState.Down)
+        if (useDown == BoundKeyState.Down && !gunBoundToUse) //Floof: add !gunBoundToAlt condition
         {
             var attackerPos = Transform(entity).MapPosition;
 

Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml

@@ -72,6 +72,17 @@
   - sprite: Mobs/Customization/reptilian_parts.rsi
     state: frills_neckfull
 
+# Floof
+- type: marking
+  id: LizardFloofNeckfull
+  bodyPart: HeadSide
+  markingCategory: HeadSide
+  speciesRestriction: [Reptilian]
+  sprites:
+  - sprite: Mobs/Customization/reptilian_parts.rsi
+    state: floof_neckfull
+# end Floof
+
 - type: marking
   id: LizardHornsAngler
   bodyPart: HeadTop

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -2101,6 +2101,7 @@
     factions:
     - Passive
   - type: Temperature
+    atmosTemperatureTransferEfficiency: 0.04 # Floof
     heatDamageThreshold: 335
     coldDamageThreshold: 230
     currentTemperature: 310.15

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -44,18 +44,56 @@
   name: Kardashev-Mosin
   parent: [BaseWeaponSniper, BaseGunWieldable]
   id: WeaponSniperMosin
-  description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
+  description: A civilian grade weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. Now with new shiny bayonet!
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+    state: base
+  - type: AmmoCounter
+  - type: Wieldable
+  - type: MeleeRequiresWield
+  - type: GunRequiresWield
+  - type: BallisticAmmoProvider
+    capacity: 5
+    proto: CartridgeLightRifle
   - type: Gun
-    fireRate: 0.75
+    useKey: true
+    fireRate: 1
     selectedMode: SemiAuto
     availableModes:
     - SemiAuto
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/sniper.ogg
     fireOnDropChance: 1
+  - type: MeleeWeapon
+    attackRate: .85
+    damage:
+      types:
+       Slash: 10
+       Piercing: 5
+    angle: 0
+    wideAnimationRotation: -135
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+  - type: EmbeddableProjectile
+    offset: 0.15,0.15
+  - type: ThrowingAngle
+    angle: -135
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Slash: 5
+        Piercing: 10
+  - type: Sharp
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
+    sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
+  - type: DisarmMalus
+    malus: 0.225
 
 - type: entity
   name: Kardashev-Mosin
@@ -66,6 +104,10 @@
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeLightRifleRubber
+    whitelist:
+      tags:
+      - CartridgeLightRifle
+
 
 - type: entity
   name: Hristov

Resources/Prototypes/Maps/Pools/default.yml

@@ -14,5 +14,5 @@
   - Submarine
   - Tortuga
   - TheHive
-  - Gax
+  #- Gax # Floof - Remvoe Gax due to mapping issues, power, access, etc.
   - Rad

Resources/Prototypes/Store/presets.yml

@@ -8,6 +8,8 @@
   - UplinkMisc
   - UplinkBundles
   - UplinkTools
+  - UplinkDeception
+  - UplinkChemicals
   - UplinkUtility
   - UplinkImplants
   - UplinkJob

Resources/ServerInfo/SpaceLaw/SpaceLaw.md

@@ -20,7 +20,7 @@
 | 14   |                         | Harassment                |                    |
 | 15   | Hooliganism             | Rioting                   | Sedition           |
 | 16   |                         | Contempt of Court         |                    |
-| 17   |                         | Sexual Harassment         | Rape               |
+| 17   |                         |                           |                    |
 | 18   | Failure To Comply       | Obstruction of Justice    |                    |
 | 19   |                         |                           |                    |
 | 20   |                         |                           |                    |
@@ -103,10 +103,6 @@ Code.-210-Charge: 5 Minutes.
 To unlawfully confine or restrict the free movement of a sophont against their will.
 Code.-208-Charge: 8 Minutes
 
-### Sexual Harassment
-To sexually harass, attempt to coerce into sexual relations, or effect unwanted sexual contact with an unwilling sophont.
-Code.-217-Charge: 6 minutes
-
 ### Endangerment
 To recklessly abandon obligations involving the continued well-being and/or protection of life and property, through malpractice, action, or inaction.
 Code.-213-Charge: 4 Minutes
@@ -158,10 +154,6 @@ Code.-308-Charge: Capital, Capital crimes necessitate a mandatory trial.
 To act to overthrow a lawfully established Chain of Command or governing body without lawful or legitimate cause.
 Code.-315-Charge: Capital, Capital crimes necessitate a mandatory trial.
 
-### Rape
-To force sexual relations on an unwilling sophont
-Code 317-Charge: Capital, Capital crimes necessitate a mandatory trial.
-
 ### Grand Endangerment
 To egregiously and recklessly abandon obligations involving the continued wellbeing and/or protection of life and property, through malpractice, action, or inaction, resulting in significant harm, injury, or death to multiple sophonts.
 Code.-313- Charge: Capital, Capital crimes necessitate a mandatory trial.

Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json

@@ -612,6 +612,10 @@
     {
       "name": "frills_neckfull",
       "directions": 4
+    },
+    {
+      "name": "floof_neckfull",
+      "directions": 4
     }
   ]
-}
+}