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

Conversation

fingersir
Copy link

@fingersir fingersir commented Dec 29, 2024

Hi. Sorry. I'm new to this bullshit.
This PR adds a variety of syndicate security content.
Mostly just for admeme.

Changelog

🆑

  • add: Syndicate security surplus hardsuits and equipment!!

@fingersir fingersir changed the title added syndsec hardsuit and helmet. Syndicate Security Surplus Dec 29, 2024
@hivehum
Copy link

hivehum commented Dec 29, 2024

you accidentally commented out your changelog. i fixed it. also for the record if you do not list a name next to 🆑 it will use your github name, but i didnt change that because idk maybe you want to be credited as fingersir

@fingersir
Copy link
Author

sorry...

@Darkmajia
Copy link

the hardsuit looks really similar to existing nukie hardsuits which feels a bit.. i'm not really sure how i feel about it. the endless ocean is fucking hilarious though. i adore it

@fingersir
Copy link
Author

I think it's ready for review and merge. Nothing more to do since making a stun bulldog bricks the game.

Yay!

@@ -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

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

{
"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

{
"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.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants