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

Security Cyborg #721

Merged
merged 89 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
76286cb
Create borg_chassis.yml
DangerRevolution Jan 25, 2024
2d4b6a7
Make da Borg
DangerRevolution Jan 25, 2024
31a5fa6
Make da Borg craftable
DangerRevolution Jan 25, 2024
6f2e548
modules, most of which don't work
DangerRevolution Jan 25, 2024
09cfdb4
Apply suggestions from death review
DangerRevolution Jan 25, 2024
8d0fa5b
we're so fucking back chat
DangerRevolution Jan 25, 2024
4d6d235
okay bola launcher is off the table
DangerRevolution Jan 25, 2024
105433e
cuffs part 2!!
DangerRevolution Jan 25, 2024
9a989b7
flashlight
DangerRevolution Jan 25, 2024
b7932fa
Rename
DangerRevolution Jan 25, 2024
8aa2fa1
Unparents NoSlip from BaseBorgChassis so SecBorgs can slip
DangerRevolution Jan 25, 2024
d3b2e9e
Gonna add PeaceKeeper modules as roundstart, lock the SecOff modules …
DangerRevolution Jan 25, 2024
ee44d8d
notes and a little less parentage
DangerRevolution Jan 25, 2024
80b3ca9
planning out what modules we want
DangerRevolution Jan 25, 2024
f40a699
modules
DangerRevolution Jan 25, 2024
2611c3b
Update borg_modules.yml
DangerRevolution Jan 25, 2024
70797d3
more planning, more comments
DangerRevolution Jan 25, 2024
7912686
lowered health
DangerRevolution Jan 26, 2024
02b2129
buff power cell & add holobarrier
DangerRevolution Jan 26, 2024
ae62c11
add to lathe & research
DangerRevolution Jan 26, 2024
5970d8b
add new module & implement new baton
DangerRevolution Jan 26, 2024
0ed07c6
Merge branch 'master' into security-borg
DangerRevolution Jan 27, 2024
b434a8f
Merge branch 'master' into security-borg
DangerRevolution Jan 28, 2024
731898f
Merge branch 'master' into security-borg
DangerRevolution Jan 28, 2024
dd7ba41
added the whistle :O
DangerRevolution Jan 28, 2024
79006df
sprites
DangerRevolution Jan 28, 2024
1062f44
adds to lathe, updates module lathe to wizden standards
DangerRevolution Jan 28, 2024
bf3b5bc
i fucking hate construction
DangerRevolution Jan 28, 2024
cb7b025
balancing
DangerRevolution Jan 28, 2024
2cbf8f5
i still hate construction.
DangerRevolution Jan 28, 2024
fa60220
locations of sprites
DangerRevolution Jan 28, 2024
809a3b0
put the research into the wrong place.
DangerRevolution Jan 28, 2024
8795928
Merge branch 'master' into security-borg
DangerRevolution Jan 28, 2024
b818062
renames
DangerRevolution Jan 28, 2024
d6f1b66
Merge branch 'security-borg' of https://github.com/DangerRevolution/D…
DangerRevolution Jan 28, 2024
7608426
baton change
DangerRevolution Jan 28, 2024
59c7537
gonna try make the inventory fit.
DangerRevolution Jan 28, 2024
dc1e9d8
linter fix
DangerRevolution Jan 28, 2024
b541008
handcuff fix thank you vmsolidus
DangerRevolution Jan 28, 2024
03c457e
linter >:(
DangerRevolution Jan 28, 2024
807308f
Merge branch 'master' into security-borg
DangerRevolution Jan 31, 2024
cc49ae9
Update Content.Shared/Cuffs/SharedCuffableSystem.cs
DangerRevolution Jan 31, 2024
f17b9ef
death suggestions
DangerRevolution Jan 31, 2024
146803a
Merge branch 'master' into security-borg
DangerRevolution Jan 31, 2024
f721610
Merge branch 'master' into security-borg
DangerRevolution Mar 14, 2024
8e1d3ea
Update security.png
DangerRevolution Mar 14, 2024
cf085b3
nuke the cuff system because i don't know how to fix it
DangerRevolution Mar 14, 2024
495696b
Delete Resources/Prototypes/DeltaV/Stacks/security_stacks.yml
DangerRevolution Mar 14, 2024
260eb44
Update borg_chassis.yml
DangerRevolution Mar 14, 2024
ae01210
Update borg_modules.yml
DangerRevolution Mar 14, 2024
81ace7e
Update borg_chassis.yml
DangerRevolution Mar 14, 2024
2947f30
Update borg_chassis.yml
DangerRevolution Mar 14, 2024
484fa68
Update security.yml
DangerRevolution Mar 14, 2024
f6bbc59
rename to security cyborg
DangerRevolution Mar 14, 2024
e55ca4c
Update borg_chassis.yml
DangerRevolution Mar 14, 2024
dcd8966
Update powercells.yml
DangerRevolution Mar 14, 2024
1d4f2a7
Update security.yml
DangerRevolution Mar 14, 2024
85ffcf3
remove more handcuff stacking
DangerRevolution Mar 14, 2024
894b816
rename of certain items to be more general
DangerRevolution Mar 14, 2024
c5358ea
Merge branch 'security-borg' of https://github.com/DangerRevolution/D…
DangerRevolution Mar 14, 2024
3743ffc
parents noslip to syndie chassis
DangerRevolution Mar 14, 2024
b08e2ed
resprite
DangerRevolution Mar 14, 2024
5cb1085
rename
DangerRevolution Mar 14, 2024
f3f07d9
Merge branch 'master' into security-borg
DangerRevolution Mar 14, 2024
4728ed8
Merge branch 'master' into security-borg
DangerRevolution Mar 27, 2024
e3d6522
Revert "resprite"
DangerRevolution Jul 6, 2024
638c60f
Merge branch 'master' of https://github.com/DeltaV-Station/Delta-v in…
DangerRevolution Jul 6, 2024
4464b24
Merge branch 'master' into security-borg
DangerRevolution Jul 6, 2024
2fffc0c
Update meta.json
DangerRevolution Jul 6, 2024
504c98b
Update tags.yml
DangerRevolution Jul 6, 2024
648064e
Update arsenal.yml
DangerRevolution Jul 6, 2024
0c87114
Update Resources/Prototypes/DeltaV/Entities/Mobs/Cyborgs/borg_chassis…
DangerRevolution Jul 6, 2024
43e499f
Using WebEdit like a Sigma
DangerRevolution Jul 6, 2024
d336655
finally fixed the fucking transponder
DangerRevolution Jul 6, 2024
8ab9687
transponder please work
DangerRevolution Jul 6, 2024
f0e443a
Update security.yml
DangerRevolution Jul 6, 2024
b79dce4
Update security.yml
DangerRevolution Jul 6, 2024
0ac65b1
Merge branch 'master' into security-borg
DangerRevolution Jul 7, 2024
e6e4a47
lyndomen suggestions
DangerRevolution Jul 18, 2024
fd959d1
Add meta.json for wood baton texture in DeltaV weapons
DangerRevolution Jul 18, 2024
8a765cd
Merge branch 'master' into security-borg
DangerRevolution Jul 18, 2024
0c474d5
Merge branch 'security-borg' of https://github.com/DangerRevolution/D…
DangerRevolution Jul 18, 2024
5c8d6ac
Merge branch 'security-borg' of https://github.com/DangerRevolution/D…
DangerRevolution Jul 18, 2024
b7a1792
Revert additional construction steps; as they do not work.
DangerRevolution Jul 19, 2024
06cd3ee
Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Security…
DangerRevolution Jul 19, 2024
728ab70
Update Resources/Prototypes/DeltaV/Entities/Objects/Specific/Robotics…
DangerRevolution Jul 19, 2024
25e5615
Apply suggestions from code review
DangerRevolution Jul 22, 2024
3b2c9da
Apply suggestions from code review
DangerRevolution Jul 22, 2024
8578f80
add delta-v comments per null
DangerRevolution Jul 22, 2024
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
@@ -0,0 +1,60 @@
- type: entity
id: BorgChassisSecurity
parent: BaseBorgChassisNT
name: security cyborg
components:
- type: Sprite
sprite: DeltaV/Mobs/Silicon/chassis.rsi
layers:
- state: security
- state: security_e_r
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: security_l
shader: unshaded
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleSecurity
hasMindState: security_e
noMindState: security_e_r
- type: Construction
node: security
- type: IntrinsicRadioReceiver
- type: IntrinsicRadioTransmitter
channels:
- Binary
- Common
- Science
- Security
- type: ActiveRadio
channels:
- Binary
- Common
- Science
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
- Security
- type: AccessReader
access: [["Security"], ["Command"], ["Research"]]
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
- type: ShowJobIcons
- type: ShowMindShieldIcons
- type: ShowCriminalRecordIcons
- type: SiliconLawProvider
laws: SiliconPolice
- type: MobThresholds
thresholds:
0: Alive
80: Critical # -20 to Crit Threshold
200: Dead
- type: FlashImmunity
- type: Speech
speechVerb: Robotic
- type: BorgTransponder
sprite:
sprite: Mobs/Silicon/chassis.rsi
state: peace
name: Security Cyborg
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
- type: entity
id: BaseBorgModuleSecurity
parent: BaseBorgModule
abstract: true
components:
- type: Tag
tags:
- BorgModuleSecurity
- type: Sprite
sprite: DeltaV/Objects/Specific/Robotics/borgmodule.rsi

# Security Modules

- type: entity
id: BorgModuleSecurityPeacekeeper # Peacekeeper Set, Available on Round Start
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: peacekeeper cyborg module
components:
- type: Sprite
layers:
- state: security
- state: icon-peacekeeper
- type: ItemBorgModule
items:
- WoodBaton
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
- SecurityWhistle

- type: entity
id: BorgModuleSecurityPatrol # Peacekeeper Set, Available on Round Start
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: patrol cyborg module
components:
- type: Sprite
layers:
- state: security
- state: icon-patrol
- type: ItemBorgModule
items:
- FlashlightSecliteRecharging
- SecurityWhistle
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
id: BorgModuleSecurityBastion # Peacekeeper Set, Available on Round Start
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: bastion cyborg module
components:
- type: Sprite
layers:
- state: security
- state: icon-hold
- type: ItemBorgModule
items:
- HoloprojectorSecurityRecharging

- type: entity
id: BorgModuleSecurityDeescalate # Research Locked - AdvancedRiotControl
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: de-escalation cyborg module
components:
- type: Sprite
layers:
- state: security
- state: icon-detain
- type: ItemBorgModule
items:
- StunbatonSelfCharging
- FlashRecharging
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
id: BorgModuleSecurityChase # Research Locked - EnergyGunsAdvanced
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: chase cyborg module
components:
- type: Sprite
layers:
- state: security
- state: icon-chase
- type: ItemBorgModule
items:
- WeaponEnergyGunMiniRecharging
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
# Security

- type: entity
id: LeftArmBorgSecurity
parent: BaseBorgArmLeft
name: security cyborg left arm
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_l_arm
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_l_arm
- type: Tag
tags:
- Trash
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
- BorgArm
- BorgSecurityLArm

- type: entity
id: RightArmBorgSecurity
parent: BaseBorgArmRight
name: security cyborg right arm
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_r_arm
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_r_arm
- type: Tag
tags:
- Trash
- BorgArm
- BorgSecurityRArm

- type: entity
id: LeftLegBorgSecurity
parent: BaseBorgLegLeft
name: security cyborg left leg
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_l_leg
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_l_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgSecurityLLeg

- type: entity
id: RightLegBorgSecurity
parent: BaseBorgLegRight
name: security cyborg right leg
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_r_leg
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_r_leg
- type: Tag
tags:
- Trash
- BorgLeg
- BorgSecurityRLeg

- type: entity
id: HeadBorgSecurity
parent: BaseBorgHead
name: security cyborg head
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_head
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_head
- type: Tag
tags:
- Trash
- BorgHead
- BorgSecurityHead

- type: entity
id: TorsoBorgSecurity
parent: BaseBorgTorso
name: security cyborg torso
components:
- type: Sprite
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_chest
- type: Icon
sprite: Objects/Specific/Robotics/cyborg_parts.rsi
state: security_chest
- type: Tag
tags:
- Trash
- BorgSecurityTorso
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
- type: entity
parent: Stunbaton
id: StunbatonSelfCharging # Someone not capitalising the B in Stun`B`aton has wasted over an hour of my life trying to fix the error.
suffix: Do Not Map, Recharging, Cyborg
noSpawn: true
components:
- type: BatterySelfRecharger
autoRecharge: true
DangerRevolution marked this conversation as resolved.
Show resolved Hide resolved
autoRechargeRate: 12
- type: GuideHelp
guides:
- Security

- type: entity
parent: Flash
id: FlashRecharging
suffix: Do Not Map , Recharging , Cyborg
noSpawn: true
components:
- type: AutoRecharge
rechargeDuration: 120
- type: GuideHelp
guides:
- Security

- type: entity
name: seclite
parent: FlashlightSeclite
id: FlashlightSecliteRecharging
description: A robust flashlight used by security.
suffix: Do Not Map , Recharging
noSpawn: true
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
- type: GuideHelp
guides:
- Security

- type: entity
name: non-lethal wooden baton
parent: BaseItem
id: WoodBaton
description: First, do no crime.
noSpawn: true
components:
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 0
- type: StaminaDamageOnHit
damage: 20 # Stuns in 5
sound: /Audio/Nyanotrasen/Weapons/club.ogg # TODO: Find a free-to-use thwacking sound effect. This isn't perfect but this works.
- type: Sprite
sprite: DeltaV/Objects/Weapons/Melee/wood_baton.rsi
state: icon
- type: GuideHelp
guides:
- Security

- type: entity
parent: WeaponEnergyGunMini
id: WeaponEnergyGunMiniRecharging
suffix: Recharging, Do Not Map
noSpawn: true
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 12

- type: entity
parent: HoloprojectorSecurity
id: HoloprojectorSecurityRecharging
suffix: Recharging, Do Not Map
noSpawn: true
components:
- type: ItemSlots
slots:
cell_slot:
name: power-cell-slot-component-slot-name-default
startingItem: PowerCellMicroreactor
disableEject: true
Loading
Loading