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

SecLink and PRIbar #1238

Merged
merged 19 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from 18 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
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_Impstation/store/categories.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SecLink
store-category-secbaton = Batons
store-category-secdisabler = Disablers
store-category-secutility = Utility
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/_Impstation/store/currency.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Seclink
store-currency-display-batontoken = BT
store-currency-display-disablertoken = DT
store-currency-display-utilitytoken = UT
27 changes: 27 additions & 0 deletions Resources/Locale/en-US/_Impstation/store/seclink-catalog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Batons
seclink-stun-baton-name = Stun Baton
seclink-stun-baton-desc = The standard issue stun baton. A Sec Officer's best friend.
seclink-fun-baton-name = Fun Baton
seclink-fun-baton-desc = Projects a heretofore unseen energy capable of entertaining even the sourest of pusses. Said to be powered by "the funniest thing any of us have ever seen," but the casing has been hermetically sealed...
seclink-stun-bat-name = Stun Bat
seclink-stun-bat-desc = Weight balanced, expertly machined, with a rubberized grip and a beautiful matte finish. Truly a mastercraft in stunning technology, no one would second guess your decision to display this over your mantle at home.
seclink-stun-sabre-name = Stun Sabre
seclink-stun-sabre-desc = This is the result of several months and several iterations of a new stun baton design. When presented to the lead of R&D they said "A katana? This is getting interesting..." which is strange, because it's definitely a sabre and not a katana.

# Disablers
seclink-disabler-name = Disabler Pistol
seclink-disabler-desc = The standard issue disabler. A Sec Officer's normal friend.
seclink-funny-disabler-name = Discombobulator
seclink-funny-disabler-desc = This disabler projects a heretofore unseen energy described as "The very essence of humor." When the inventor was questioned about the implications of their discovery, they simply responded, "It works, doesn't it? Leave me alone."
seclink-pocket-disabler-name = Pocket Disabler
seclink-pocket-disabler-desc = A compact disabler variant that trades battery size for portability. It's just as effective as the standard variant... so long as you don't miss.
seclink-auto-disabler-name = Auto Disabler
seclink-auto-disabler-desc = While not as potent as the Disabler SMG, this remains a competent option for midrange suspect apprehension.
seclink-stun-projector-name = Stun Projector
seclink-stun-projector-desc = The Stun Projector creates the same energy as a standard disabler, then accelerates that bolt to 299792458 meters per second. This both increases its effectiveness and allows it to pass through windows without dissipating, in exchange for less rounds and a slower fire rate.

# Utility
seclink-crowbar-name = P.R.I.bar
seclink-crowbar-desc = A collapsible, pocket-sized crowbar, purpose built for prying open airlocks. Ask anyone what the acronym means and you'll always get a different answer.
seclink-handheld-records-name = Portable Criminal Records Computer
seclink-handheld-records-desc = This device allows you to bring up the station's criminal records computer from the palm of your hand. Useful for detectives that hate calling in, or sharing fun factoids with your friends at the bar, like "Hey, do you want to know the exact structure of your DNA?"
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_Impstation/store/store.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Seclink
store-preset-name-seclink = SecLink
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Items/belt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
id: BeltSecurityEntityTable
table: !type:AllSelector
children:
- id: Stunbaton
#- id: Stunbaton impcluded in SecLink
Pivotbash marked this conversation as resolved.
Show resolved Hide resolved
- id: Handcuffs
- id: Handcuffs
- id: HoloprojectorSecurity
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@
- id: WantedListCartridge
- id: ClothingNeckBronzeheart #imp
- id: TicketPad #imp special
- id: BaseSeclinkRadio #imp
- id: PillCanisterHOS #imp

# Hardsuit table, used for suit storage as well
Expand Down
11 changes: 9 additions & 2 deletions Resources/Prototypes/Catalog/Fills/Lockers/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
amount: 2
- id: ClothingHeadsetWarden
- id: ClothingOuterHardsuitBrigmedic
- id: BoxToken #imp
- id: BaseSeclinkRadio #imp

- type: entity
id: LockerWardenFilled
Expand Down Expand Up @@ -55,6 +57,8 @@
- id: ClothingOuterHardsuitBrigmedic
- id: ClothingHeadsetWarden
- id: TicketPad #imp special
- id: BoxToken #imp
- id: BaseSeclinkRadio #imp

- type: entity
id: LockerSecurityFilled
Expand All @@ -65,7 +69,7 @@
contents:
- id: FlashlightSeclite
prob: 0.8
- id: WeaponDisabler
#- id: WeaponDisabler included in SecLink
- id: ClothingUniformJumpsuitSecGrey
prob: 0.3
- id: ClothingHeadHelmetBasic
Expand All @@ -84,6 +88,7 @@
- id: BookSpaceLaw
prob: 0.5
- id: TicketPad #imp special
- id: BaseSeclinkRadio #imp

- type: entity
id: LockerBrigmedicFilled
Expand All @@ -93,7 +98,7 @@
- type: StorageFill
contents:
- id: ClothingEyesGlassesSecurity
- id: WeaponDisabler
#- id: WeaponDisabler included in SecLink
- id: TrackingImplanter
amount: 2
- id: ClothingOuterHardsuitBrigmedic
Expand All @@ -120,6 +125,7 @@
- id: ClothingNeckCloakMoth #bzzz Moth-pocalypse
prob: 0.15
- id: TicketPad #imp special
- id: BaseSeclinkRadio #imp

- type: entity
id: LockerDetectiveFilled
Expand All @@ -144,6 +150,7 @@
- id: HoloprojectorSecurity
- id: BoxEvidenceMarkers
- id: HandLabeler
- id: BaseSeclinkRadio # imp
- id: BoxTapeRecorder # DeltaV

- type: entity
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@
- Flash
- ForensicPad
- ForensicScanner
- BatonToken1 #imp
- DisablerToken1 #imp
- UtilityToken1 #imp
- CrayonChalk # imp edit
4 changes: 4 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,7 @@
back:
- Flash
- MagazinePistol
- BatonToken1 #imp
- DisablerToken1 #imp
- UtilityToken1 #imp

3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,7 @@
back:
- Flash
- MagazinePistol
- BatonToken1 #imp
- DisablerToken1 #imp
- UtilityToken1 #imp
- WeaponPistolMk58
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@
back:
- Flash
- MagazinePistol
- BatonToken1 #imp
- DisablerToken1 #imp
- UtilityToken1 #imp
4 changes: 4 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/warden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,7 @@
back:
- Flash
- MagazinePistol
- BatonToken1 #imp
- DisablerToken1 #imp
- UtilityToken1 #imp

21 changes: 21 additions & 0 deletions Resources/Prototypes/_Impstation/Catalog/Fills/Boxes/security.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Seclink
- type: entity
name: token box
parent: BoxCardboard
id: BoxToken
description: A box full of tokens meant to be used in the SecLink radio.
components:
- type: Storage
grid:
- 0,0,2,0
- type: StorageFill
contents:
- id: BatonToken1
amount: 5
Pivotbash marked this conversation as resolved.
Show resolved Hide resolved
- id: DisablerToken1
amount: 5
- id: UtilityToken1
amount: 5
- type: Sprite
layers:
- state: box_security
112 changes: 112 additions & 0 deletions Resources/Prototypes/_Impstation/Catalog/seclink_catalog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
#Baton Skins
- type: listing
id: SeclinkBaton
name: seclink-stun-baton-name
description: seclink-stun-baton-desc
productEntity: Stunbaton
cost:
BatonToken: 1
categories:
- SeclinkBaton

- type: listing
id: SeclinkFunBaton
name: seclink-fun-baton-name
description: seclink-fun-baton-desc
productEntity: Funbaton
cost:
BatonToken: 1
categories:
- SeclinkBaton

- type: listing
id: SeclinkBat
name: seclink-stun-bat-name
description: seclink-stun-bat-desc
productEntity: Stunbat
cost:
BatonToken: 1
categories:
- SeclinkBaton

- type: listing
id: SeclinkSabre
name: seclink-stun-sabre-name
description: seclink-stun-sabre-desc
productEntity: Stunsabre
cost:
BatonToken: 1
categories:
- SeclinkBaton

#Disabler Options
- type: listing
id: SeclinkDisabler
name: seclink-disabler-name
description: seclink-disabler-desc
productEntity: WeaponDisabler
cost:
DisablerToken: 1
categories:
- SeclinkDisabler

- type: listing
id: SeclinkFunnyDisabler
name: seclink-funny-disabler-name
description: seclink-funny-disabler-desc
productEntity: WeaponFunnyDisabler
cost:
DisablerToken: 1
categories:
- SeclinkDisabler

- type: listing
id: SeclinkPocketDisabler
name: seclink-pocket-disabler-name
description: seclink-pocket-disabler-desc
productEntity: WeaponPocketDisabler
cost:
DisablerToken: 1
categories:
- SeclinkDisabler

- type: listing
id: SeclinkAutoDisabler
name: seclink-auto-disabler-name
description: seclink-auto-disabler-desc
productEntity: WeaponAutoDisabler
cost:
DisablerToken: 1
categories:
- SeclinkDisabler

- type: listing
id: SeclinkStunProjector
name: seclink-stun-projector-name
description: seclink-stun-projector-desc
productEntity: WeaponStunProjector
cost:
DisablerToken: 1
categories:
- SeclinkDisabler

#Utility Options
- type: listing
id: SeclinkCrowbar
name: seclink-crowbar-name
description: seclink-crowbar-desc
productEntity: Pribar
cost:
UtilityToken: 1
categories:
- SeclinkUtility

- type: listing
id: SeclinkHandheldCriminalRecords
name: seclink-handheld-records-name
description: seclink-handheld-records-desc
productEntity: HandheldCriminalRecords
cost:
UtilityToken: 1
categories:
- SeclinkUtility
Loading
Loading