diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 56cec266c3..fcf306eee1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -55,6 +55,7 @@ - id: ClothingNeckBronzeheart - id: ClothingNeckGoldmedal - id: RubberStampCaptain + - id: AntiqueLaserGun - type: entity id: LockerHeadOfPersonnelFilled diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 1095d09da2..2879ec8a06 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -174,6 +174,27 @@ - type: PowerCellVisualizer prefix: s_ar +- type: entity + name: antique power cell prototype + description: A small cell that self recharges. Used in old laser arms research. + id: PowerCellAntiqueProto + parent: PowerCellSmallBase + components: + - type: Sprite + sprite: Objects/Power/PowerCells/power_cell_small_autorecharge.rsi + layers: + - state: s_ar + - type: Battery + maxCharge: 60 + startingCharge: 60 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 5 + - type: Appearance + visuals: + - type: PowerCellVisualizer + prefix: s_ar + - type: entity name: medium standard power cell description: A rechargeable standardized power cell, size M. This is the cheapest kind you can find. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index e8c26726ff..42c112d331 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -371,3 +371,40 @@ magState: mag steps: 5 zeroVisible: true + +- type: entity + name: antique laser gun + parent: BatteryGunSmall + id: AntiqueLaserGun + description: This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. + components: + - type: Sprite + netsync: false + sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi + layers: + - state: base + map: ["enum.RangedBarrelVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.RangedBarrelVisualLayers.MagUnshaded"] + shader: unshaded + - type: Item + size: 12 + sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi + - type: BatteryBarrel + fireCost: 6 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: RangedWeapon + - type: PowerCellSlot + descFormatString : "" # empty string for no examine-text (cell is not ejectable) + cellSlot: + startingItem: PowerCellAntiqueProto + soundOptions: + volume: -2 + locked: true + - type: Appearance + visuals: + - type: MagVisualizer + magState: mag + steps: 5 + zeroVisible: true diff --git a/Resources/Prototypes/Objectives/traitorObjectives..yml b/Resources/Prototypes/Objectives/traitorObjectives..yml index 85884bc5d0..4f36763aae 100644 --- a/Resources/Prototypes/Objectives/traitorObjectives..yml +++ b/Resources/Prototypes/Objectives/traitorObjectives..yml @@ -156,3 +156,18 @@ conditions: - !type:StealCondition prototype: FoodMeatCorgi + +- type: objective + id: CaptainGunStealObjective + issuer: syndicate + difficultyOverride: 2.75 + prob: 0.1 + requirements: + - !type:TraitorRequirement {} + - !type:IncompatibleConditionsRequirement + conditions: + - DieCondition + conditions: + - !type:StealCondition + prototype: AntiqueLaserGun + diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png new file mode 100644 index 0000000000..d6da03ed28 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png new file mode 100644 index 0000000000..d2e461be28 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png new file mode 100644 index 0000000000..9c4b6595ca Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-1.png new file mode 100644 index 0000000000..fffef667ce Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-2.png new file mode 100644 index 0000000000..02b89bc829 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-3.png new file mode 100644 index 0000000000..03d72bc4d6 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left.png new file mode 100644 index 0000000000..c05ed4833f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png new file mode 100644 index 0000000000..ed537d5e86 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-1.png new file mode 100644 index 0000000000..6092067e96 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-2.png new file mode 100644 index 0000000000..f4d0f8c925 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-3.png new file mode 100644 index 0000000000..2e942238ea Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right.png new file mode 100644 index 0000000000..d66f84f632 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png new file mode 100644 index 0000000000..32fba189df Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..b0fa62d39f Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..4ad441aa0b Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..1678a31534 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..5300c65d31 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json new file mode 100644 index 0000000000..4aa7146472 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "taken from tg station at commithttps://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left-0", + "directions": 4 + }, + { + "name": "inhand-right-0", + "directions": 4 + }, + { + "name": "inhand-left-1", + "directions": 4 + }, + { + "name": "inhand-right-1", + "directions": 4 + }, + { + "name": "inhand-left-2", + "directions": 4 + }, + { + "name": "inhand-right-2", + "directions": 4 + }, + { + "name": "inhand-left-3", + "directions": 4 + }, + { + "name": "inhand-right-3", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}