Secmodules 2 #436

fenndragon · 2024-12-27T03:26:13Z

Description

Adds a couple more Security Borg modules to the game, one which is for detective work, and one for heavy assault/combat.
I've also ported the Energy Shotgun from Wizden with this PR

Changelog

🆑

add: Added 2 new modules
add: Quadborg recipes
tweak: Tweaked Secborg setup
tweak: Tweaked Core map

github-actions · 2024-12-27T03:26:56Z

RSI Diff Bot; head commit dc12142 merging into 81c0a15
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Mobs/Silicon/quad.rsi

State	Old	New	Status
quadsprite			Modified
quadspriteCC			Added

Resources/Textures/Floof/Objects/Specific/Robotics/parts.rsi

State	Old	New	Status
borg_chest+o			Added
borg_head+o			Added
borg_l_arm+o			Added
borg_l_leg+o			Added
borg_r_arm+o			Added
borg_r_leg+o			Added
quad_suit			Added

Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi

State	Old	New	Status
base			Added
equipped-BACKPACK			Added
equipped-SUITSTORAGE			Added
icon			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added

Edit: diff updated after dc12142

…into Modules

FoxxoTrystan

If you wish borg the ability to strip i suggest adding this PR:

space-wizards/space-station-14#32750

FoxxoTrystan · 2024-12-27T21:04:22Z

Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml

+  - type: Body
+    prototype: Primate
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: Inventory
+    templateId: Securityborg


Suggested change

- type: Body

prototype: Primate

requiredLegs: 1 # TODO: More than 1 leg

- type: Inventory

templateId: Securityborg

This is uneeded.

its required to give them the pocket to put handcuffs in

Then make a custom item/tool for borgs to cuff someone.

this has already been discussed with floof, cuffs in a module don't work, I already looked into an alternative for this.

FoxxoTrystan · 2024-12-27T21:04:34Z

Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml

+  id: Securityborg
+  slots:
+  - name: pocket1
+    slotTexture: pocket
+    slotFlags: POCKET
+    slotGroup: MainHotbar
+    stripTime: 3
+    uiWindowPos: 0,3
+    strippingWindowPos: 0,4
+    displayName: Pocket 1
+    stripHidden: false


Suggested change

- type: inventoryTemplate

id: Securityborg

slots:

- name: pocket1

slotTexture: pocket

slotFlags: POCKET

slotGroup: MainHotbar

stripTime: 3

uiWindowPos: 0,3

strippingWindowPos: 0,4

displayName: Pocket 1

stripHidden: false

We not allowing to provide borgs with pockets/inventory.

the pocket is required to allow the borg to be able to apprehend with cuffs

umm when I made a borg you didn't need any of that just need to put the cuff in the mod and it was useable

the cuffs act like they can be used but they will not actually cuff people if you just stick them in the module

FoxxoTrystan · 2024-12-27T21:05:40Z

Resources/Prototypes/Entities/Objects/Devices/pda.yml

-      - SecWatchCartridge
+      - LogProbeCartridge


Do not remove SecWatch

there is presently a bug that doesn't allow logprobe to be installed

Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml

FoxxoTrystan · 2024-12-27T21:07:28Z

Resources/Prototypes/Floof/Entities/Objects/Specific/Robotics/Borgmodules.yml

+    items:
+    - ForensicScanner
+    - DetectivePDA


Giving a full PDA seem just... bad, there should be another way.

to my knowledge there is not to be able to allow them to utilize logprobing with doors

Mnemotechnician · 2024-12-27T21:49:24Z

Content.Shared/Projectiles/ProjectileSpreadComponent.cs

+/// Spawns a spread of the projectiles when fired
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedGunSystem))]
+public sealed partial class ProjectileSpreadComponent : Component


This component is unused. I don't see why it's here.

it honestly shouldn't be, I could've sworn I removed it

Resources/Maps/core.yml

fenndragon · 2025-01-05T22:34:11Z

all PRS separated and set up

Memeji

Told this has been accepted by Floof and passed tests.

fenndragon added 8 commits December 26, 2024 14:51

Update handcuffs.yml

0875db1

hand

5a31aea

Update pda.yml

341cc29

Update Borgmodules.yml

133f0bc

Update pda.yml

e79b638

guns

9e06581

guns

8f4af9a

no shells

621436e

fenndragon requested review from Fansana, Memeji and FoxxoTrystan as code owners December 27, 2024 03:26

github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Dec 27, 2024

fenndragon added 7 commits December 26, 2024 20:32

Update handcuffs.yml

277f289

Update handcuffs.yml

e43db7a

Merge branch 'Modules' of https://github.com/fenndragon/floofstation1 …

7c63225

…into Modules

Update handcuffs.yml

f65af08

Update guns.yml

e393f2b

Update GunSystem.cs

9d30c75

Delete ProjectileSpreadComponent.cs

ef90690

FoxxoTrystan added Priority: 3-Low Should be resolved at some point Undergoing Maintainer Discussion This PR is currently going through an internal discussion by the maintainer team. labels Dec 27, 2024

FoxxoTrystan assigned fenndragon Dec 27, 2024

FoxxoTrystan requested changes Dec 27, 2024

View reviewed changes

FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Dec 27, 2024

Mnemotechnician reviewed Dec 27, 2024

View reviewed changes

fenndragon added 11 commits January 1, 2025 13:02

r

c2f5ad3

Update endoskeleton.yml

7e6077f

dude

596255f

there

f11f9e0

fix

e8685ce

final

36f69ce

Update quad_suit.png

4c6cb11

finished

bc6748e

Update lathe.yml

febc9b0

remove recipe

b237859

Update quadborg.yml

67b98fe

FoxxoTrystan reviewed Jan 4, 2025

View reviewed changes

Resources/Maps/core.yml Outdated Show resolved Hide resolved

fenndragon added 2 commits January 4, 2025 14:21

sprites

dd0d453

Update endoskeleton.yml

a7f2d5d

FoxxoTrystan reviewed Jan 5, 2025

View reviewed changes

Resources/Maps/core.yml Outdated Show resolved Hide resolved

separation

820477a

update

f1d75e4

github-actions bot added the Changes: Localization Changes any ftl files label Jan 6, 2025

Update laws.ftl

8bf03cf

FoxxoTrystan self-requested a review January 7, 2025 11:25

github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Jan 7, 2025

Merge branch 'master' into Modules

dc12142

Memeji approved these changes Jan 9, 2025

View reviewed changes

Memeji merged commit 9c91222 into Fansana:master Jan 9, 2025
13 checks passed

Floof-Station-Bot added a commit that referenced this pull request Jan 9, 2025

Automatic Changelog Update (#436)

6f1416c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Secmodules 2 #436

Secmodules 2 #436

fenndragon commented Dec 27, 2024 •

edited by Fansana

Loading

github-actions bot commented Dec 27, 2024 •

edited

Loading

FoxxoTrystan left a comment

FoxxoTrystan Dec 27, 2024

FoxxoTrystan Dec 27, 2024

fenndragon Dec 28, 2024

FoxxoTrystan Dec 28, 2024

fenndragon Dec 28, 2024

FoxxoTrystan Dec 27, 2024

FoxxoTrystan Dec 27, 2024

fenndragon Dec 28, 2024

VividPups Dec 28, 2024

fenndragon Dec 28, 2024

FoxxoTrystan Dec 27, 2024

fenndragon Dec 28, 2024

FoxxoTrystan Dec 27, 2024

fenndragon Dec 28, 2024

Mnemotechnician Dec 27, 2024

fenndragon Dec 28, 2024

fenndragon commented Jan 5, 2025

Memeji left a comment

Secmodules 2 #436

Secmodules 2 #436

Conversation

fenndragon commented Dec 27, 2024 • edited by Fansana Loading

Description

Changelog

github-actions bot commented Dec 27, 2024 • edited Loading

FoxxoTrystan left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fenndragon commented Jan 5, 2025

Memeji left a comment

Choose a reason for hiding this comment

fenndragon commented Dec 27, 2024 •

edited by Fansana

Loading

github-actions bot commented Dec 27, 2024 •

edited

Loading