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 Borg #420

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
e54fb22
Merge branch 'Fansana:master' into master
fenndragon Nov 3, 2024
dbfdb83
Merge branch 'Fansana:master' into master
fenndragon Nov 7, 2024
e5d52b8
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Nov 18, 2024
3d875f6
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Nov 18, 2024
158faf2
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Nov 20, 2024
7e2dd64
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Nov 27, 2024
011a207
Create folder
fenndragon Dec 12, 2024
1c393df
Add files via upload
fenndragon Dec 12, 2024
4165083
Merge branch 'Fansana:master' into master
fenndragon Dec 12, 2024
032291f
Merge branch 'Fansana:master' into master
fenndragon Dec 16, 2024
06fda0c
Merge branch 'master' of https://github.com/fenndragon/floofstation1
fenndragon Dec 16, 2024
59bd1a1
Delete Content.Client/DeltaV/RainLizard directory
fenndragon Dec 16, 2024
adb4986
Merge branch 'Fansana:master' into Modules
fenndragon Dec 18, 2024
738e6c4
quadborg
fenndragon Dec 19, 2024
e5e95be
Delete Content.Shared/_RMC14/Guidebook/GuideEntryPrototype.cs
fenndragon Dec 19, 2024
e7733a7
quad
fenndragon Dec 19, 2024
6a44521
fix
fenndragon Dec 19, 2024
cdbd033
Merge branch 'Modules' of https://github.com/fenndragon/floofstation1…
fenndragon Dec 19, 2024
6fbc19e
fix
fenndragon Dec 19, 2024
6fefa71
Update battery_guns.yml
fenndragon Dec 19, 2024
e791f90
Update borg_chassis.yml
fenndragon Dec 19, 2024
54e2530
Update borg_chassis.yml
fenndragon Dec 19, 2024
6bf9a6d
sprites
fenndragon Dec 19, 2024
cbe5064
there
fenndragon Dec 20, 2024
d28728b
Delete security.png
fenndragon Dec 20, 2024
4e357d0
Update meta.json
fenndragon Dec 20, 2024
170b3c3
Update Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
fenndragon Dec 20, 2024
919f248
Update Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/…
fenndragon Dec 20, 2024
b671a19
Update Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
fenndragon Dec 20, 2024
ba95ee3
Update Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/…
fenndragon Dec 20, 2024
69b62a8
s
fenndragon Dec 20, 2024
524f022
Merge branch 'Modules' of https://github.com/fenndragon/floofstation1…
fenndragon Dec 20, 2024
5ccb1ee
Update quadborg.yml
fenndragon Dec 20, 2024
69f1b76
Update quadborg.yml
fenndragon Dec 20, 2024
a769672
there
fenndragon Dec 20, 2024
5a38f00
Update Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
fenndragon Dec 20, 2024
24f65cf
fixmaybe
fenndragon Dec 21, 2024
6260d8a
Update quadborg.yml
fenndragon Dec 21, 2024
364d852
Update Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
fenndragon Dec 21, 2024
cad3506
bunch o shit
Fansana Dec 23, 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
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@
steps: 5
zeroVisible: true
- type: Appearance

- type: entity
name: antique laser pistol
parent: BaseWeaponBatterySmall
Expand Down
40 changes: 40 additions & 0 deletions Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
Copy link
Collaborator

Choose a reason for hiding this comment

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

A suggestion but you should add IntrinsicRadioTransmitter and ActiveRadio comp so the borg can speak also in security channels.

I suggest those channels: Binary, Common, Security, Science

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know, I think until we get these buildable having them start with security channel might be iffy

Copy link
Collaborator

Choose a reason for hiding this comment

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

You gave them AccessReader with security access, this borg is a security chassie correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, but until they are actually something that may be assembled I think the channel keys should be something put in manually

Copy link
Collaborator

Choose a reason for hiding this comment

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

This Cyborg is missing/using duplicated sprite for mind state, while this is not an issue right now, when its is public this will need to be changed.

Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

- type: entity
id: BorgChassisQuad
parent: BaseBorgChassisNT
components:
- type: Sprite
sprite: Floof/Mobs/Silicon/quad.rsi
scale: 0.6, 0.6
layers:
- state: quadsprite
map: ["movement"]
- state: quadspritel
map: ["enum.BorgVisualLayers.Light"]
shader: unshaded
visible: false
- state: quadspriter
shader: unshaded
map: ["light"]
visible: false
- type: BorgChassis
maxModules: 4
moduleWhitelist:
tags:
- BorgModuleGeneric
- BorgModuleSecurity
hasMindState: quadspritel
noMindState: quadspriter
- type: AccessReader
access: [["Security"], ["Armory"], ["Command"]]
- type: BorgTransponder
sprite:
sprite: Floof/Mobs/Silicon/quad.rsi
state: quadsprite
name: cyborg
- type: Construction
node: cyborg
- type: Speech
speechVerb: Robotic
- type: LayingDown
- type: LeashAnchor # Floofstation
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
- type: entity
id: BaseBorgModuleSecurity
parent: BaseBorgModule
abstract: true
components:
- type: Tag
tags:
- BorgModuleSecurity

- type: entity
id: BorgModuleStun
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: Disabler cyborg module
components:
- type: Sprite
sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
layers:
- state: security
- state: icon-stun
- type: ItemBorgModule
items:
- WeaponBorgDisabler
- BorgStunbaton

- type: entity
id: BorgModuleKill
parent: [ BaseBorgModuleSecurity, BaseProviderBorgModule ]
name: combat cyborg module
components:
- type: Sprite
sprite: Floof/Objects/Specific/Robotics/borgmodule.rsi
layers:
- state: security
- state: icon-kill
- type: ItemBorgModule
items:
- WeaponAdvancedLaser
- WeaponborgPistolMk58
- CombatKnife
10 changes: 10 additions & 0 deletions Resources/Prototypes/Floof/Entities/Objects/Weapons/Melee.yml
FoxxoTrystan marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,13 @@
- type: Tag
tags:
- WhitelistChameleon

- type: entity
name: borg stun baton
parent: Stunbaton
id: BorgStunbaton
description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone.
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 40
89 changes: 89 additions & 0 deletions Resources/Prototypes/Floof/Entities/Objects/Weapons/guns.yml
FoxxoTrystan marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@

- type: entity
name: borg disabler
parent: WeaponDisabler
id: WeaponBorgDisabler
description: A self-defense weapon that exhausts organic targets, weakening them until they collapse.
components:
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 30

# - type: entity
# name: borg taser
# parent: BaseWeaponBatterySmall
# id: WeaponborgTaser
# description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range.
# components:
# - type: Tag
# tags:
# - Taser
# - Sidearm
# - type: Sprite
# sprite: Objects/Weapons/Guns/Battery/taser.rsi
# layers:
# - state: base
# map: ["enum.GunVisualLayers.Base"]
# - state: mag-unshaded-0
# map: ["enum.GunVisualLayers.MagUnshaded"]
# shader: unshaded
# - type: Item
# heldPrefix: taser4
# - type: Clothing
# quickEquip: false
# slots:
# - Belt
# - type: Gun
# soundGunshot:
# path: /Audio/Weapons/Guns/Gunshots/taser.ogg
# - type: ProjectileBatteryAmmoProvider
# proto: BulletTaser
# fireCost: 200
# - type: BatterySelfRecharger
# autoRecharge: true
# autoRechargeRate: 40
# - type: MagazineVisuals
# magState: mag
# steps: 5
# zeroVisible: true
# - type: Appearance

- type: entity
name: Borg mk 58
parent: BaseWeaponBatterySmall
id: WeaponborgPistolMk58
description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy.
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
components:
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
layers:
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Clothing
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: Gun
fireRate: 5
availableModes:
- SemiAuto
soundGunshot:
path: /Audio/Weapons/Guns/Gunshots/mk58.ogg
fireOnDropChance: 0.5
- type: ProjectileBatteryAmmoProvider
proto: BulletKineticShuttle
fireCost: 100
- type: BatterySelfRecharger
autoRecharge: true
autoRechargeRate: 40
- type: Battery
maxCharge: 1000
startingCharge: 1000
- type: Appearance
- type: Tag
tags:
- HighRiskItem
- Sidearm
- WeaponAntiqueLaser
- type: StaticPrice
price: 750
- type: StealTarget
stealGroup: WeaponAntiqueLaser
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions Resources/Prototypes/Floof/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@

- type: Tag
id: MuzzleIngredient

- type: Tag
id: BorgModuleSecurity
24 changes: 24 additions & 0 deletions Resources/Textures/Floof/Mobs/Silicon/quad.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"version": 1,
"size": {
"x": 64,
"y": 64
},
"license": "CC-BY-SA-3.0",
"copyright": "Made by Fenndragon discord: 190763499276861440",
"states": [
{
"name": "quadsprite",
"directions": 4
},
{
"name": "quadspritel",
"directions": 4
},
{
"name": "quadspriter",
"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,32 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "base by EmoGarbage404, icons by Fenndragon: 190763499276861440.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "security"
},
{
"name": "icon-Advmeasures"
},
{
"name": "icon-stun"
},
{
"name": "icon-kill"
},
{
"name": "icon-capture"
},
{
"name": "icon-investigation"
},
{
"name": "icon-explosive"
}
]
}
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ehh this inst normal, did you remove something by mistake?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I moved an unused sprite into my rsi so it can be used. Because you said to. The image and the module itself both need to be in the rsi

File renamed without changes
fenndragon marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ehh this inst normal, did you remove something by mistake?

Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@
{
"name": "science"
},
{
"name": "security"
},
{
"name": "service"
},
Expand Down
Loading