-
-
Notifications
You must be signed in to change notification settings - Fork 75
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
base: master
Are you sure you want to change the base?
Changes from all commits
223e515
982acc0
8f2c2d8
1e13554
580b05a
77bb170
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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 |
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! | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
---|---|---|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
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", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
} | ||
] | ||
} |
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", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
} | ||
] | ||
} |
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 | ||
} | ||
] | ||
} |
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 | ||
} | ||
] | ||
} |
There was a problem hiding this comment.
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