Skip to content
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.

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

Syndicate Security Surplus #1158

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -690,15 +690,19 @@
sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
layers:
- state: grenade
- type: StaminaDamageOnCollide
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please comment on your changes in this file something like # imp so in the case that upstream alters baton grenades then whoever does the merge knows that we fucked with the file

damage: 80
- type: Projectile
deleteOnCollide: false
impactEffect: BulletImpactEffectDisabler #stolen from the disabler bullet. God it was hard to make it make the stun baton sound
damage:
types:
Blunt: 1
Blunt: 5
soundHit:
path: /Audio/Effects/gen_hit.ogg
- type: StaminaDamageOnCollide
damage: 80
path: /Audio/Weapons/egloves.ogg
forceSound: true




- type: entity
id: BulletGrenadeBlast
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: ClothingBackpackDuffelSyndicateBundle
id: ClothingBackpackDuffelSyndicateSecBundle
name: syndicate peacekeeper hardsuit bundle
description: "Contains everything a Syndicate security officer needs to keep the peace."
components:
- type: StorageFill
contents:
- id: ClothingOuterHardsuitSyndieSec
- id: ClothingHandsGlovesCombat
- id: ClothingMaskGasSecurity
- id: ClothingEyesHudSyndicateSec
- id: DoubleEmergencyOxygenTankFilled
- id: DoubleEmergencyNitrogenTankFilled
12 changes: 12 additions & 0 deletions Resources/Prototypes/_Impstation/Entities/Clothing/Eyes/hud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- type: entity
parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband]
id: ClothingEyesHudSyndicateSec
name: syndicate peacekeeper visor
description: The syndicate's OTHER professional heads-up display, designed for better detection of humanoids and their subsequent elimination. This one's flashproof!
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Syndicate is a proper noun and should be capitalized. check this across all altered files please

components:
- type: Sprite
sprite: _Impstation/Clothing/Eyes/Hud/syndisec.rsi
- type: Clothing
sprite: _Impstation/Clothing/Eyes/Hud/syndisec.rsi
- type: ShowSyndicateIcons
- type: FlashImmunity
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,27 @@
sprite: _Impstation/Clothing/Head/Hardsuits/mimeblack.rsi
- type: Clothing
sprite: _Impstation/Clothing/Head/Hardsuits/mimeblack.rsi

#Syndicate security hardsuit helmet
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitSyndieSec
name: blood-red peacekeeper hardsuit helmet
description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: _Impstation/Clothing/Head/Hardsuits/syndiesec.rsi
- type: Clothing
sprite: _Impstation/Clothing/Head/Hardsuits/syndiesec.rsi
- type: PointLight
color: green
- type: PressureProtection
highPressureMultiplier: 0.08
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Heat: 0.9
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,40 @@
node: blackmimeHardsuit
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMimeBlack

# Syndicate security hardsuit
- type: entity
parent: [ ClothingOuterHardsuitBase, BaseSyndicateContraband ]
id: ClothingOuterHardsuitSyndieSec
name: blood-red peacekeeper hardsuit
description: An armored-enough hardsuit designed for work in routine security operations. Property of RiC Office Supply.
components:
- type: Sprite
sprite: _Impstation/Clothing/OuterClothing/Hardsuits/syndiesec.rsi
- type: Item
size: Huge
- type: Clothing
sprite: _Impstation/Clothing/OuterClothing/Hardsuits/syndiesec.rsi
- type: PressureProtection
highPressureMultiplier: 0.05
lowPressureMultiplier: 1000
- type: ExplosionResistance
damageCoefficient: 0.5
- type: Armor
modifiers:
coefficients:
Blunt: 0.6
Slash: 0.6
Piercing: 0.5
Heat: 0.9
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.9
- type: HeldSpeedModifier
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitSyndieSec
- type: Tag
tags:
- MonkeyWearable
- Hardsuit
- WhitelistChameleon
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
- type: entity
name: endless ocean
parent: [BaseWeaponBattery, BaseGunWieldable, BaseGrandTheftContraband]
id: WeaponEndlessOcean
description: A one-of-a-kind prototype energy weapon that can produce various types of hardlight grenades from an internal energy resevoir.
components:
- type: Sprite
sprite: _Impstation/Objects/Weapons/Guns/Launchers/endless_ocean.rsi
layers:
- state: icon
map: ["enum.GunVisualLayers.Base"]
- type: Clothing
sprite: _Impstation/Objects/Weapons/Guns/Launchers/endless_ocean.rsi
- type: Gun
fireRate: 1
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg
- type: ProjectileBatteryAmmoProvider
proto: GrenadeBaton
fireCost: 150 #imp revert
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove this comment lmao its regarding me unnerfing the energy shotgun

- type: BatteryWeaponFireModes
fireModes:
- proto: GrenadeBaton
fireCost: 150
- proto: GrenadeFlash
fireCost: 150
- proto: GrenadeEMP
fireCost: 150
- type: Item
size: Large
shape:
- 0,0,3,1
- type: Tag
tags:
- HighRiskItem
- type: GunRequiresWield
- type: Battery
maxCharge: 750
startingCharge: 750
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by IntegerTempest",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you arent IntegerTempest, right? if you sourced this art asset from somewhere else, could you provide a link? asking in part because i cannot source this sprite anywhere

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox states by Flareguy for Space Station 14",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i don't think this copyright line is correct.


"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Spliced together by Flanburgr. Original sprites taken from vg at commit https://github.com/vgstation-coders/vgstation13/commit/a16e41020a93479e9a7e2af343b1b74f7f2a61bd. Vox state made by Flareguy for SS14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/pull/6042/commits/64916c98f4847acc4adf3a2416bf78c005fd7dd7, https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/guns/launcher/grenadelauncher.dmi, backpack sprite by Peptide, backpack sling sprite edited by Boaz1111, wield sprites by RiceMar1244. Further edits by Flanburgr.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
},
{
"name": "equipped-SUITSTORAGE",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading