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

Secmodules 2 #436

Merged
merged 49 commits into from
Jan 9, 2025
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
0875db1
Update handcuffs.yml
fenndragon Dec 26, 2024
5a31aea
hand
fenndragon Dec 26, 2024
341cc29
Update pda.yml
fenndragon Dec 26, 2024
133f0bc
Update Borgmodules.yml
fenndragon Dec 26, 2024
e79b638
Update pda.yml
fenndragon Dec 27, 2024
9e06581
guns
fenndragon Dec 27, 2024
8f4af9a
guns
fenndragon Dec 27, 2024
621436e
no shells
fenndragon Dec 27, 2024
277f289
Update handcuffs.yml
fenndragon Dec 27, 2024
e43db7a
Update handcuffs.yml
fenndragon Dec 27, 2024
7c63225
Merge branch 'Modules' of https://github.com/fenndragon/floofstation1…
fenndragon Dec 27, 2024
f65af08
Update handcuffs.yml
fenndragon Dec 27, 2024
e393f2b
Update guns.yml
fenndragon Dec 27, 2024
9d30c75
Update GunSystem.cs
fenndragon Dec 27, 2024
ef90690
Delete ProjectileSpreadComponent.cs
fenndragon Dec 27, 2024
400d0c4
Delete Content.Shared/Projectiles/ProjectileSpreadComponent.cs
fenndragon Dec 28, 2024
55cbc45
Update Resources/Prototypes/Floof/Entities/Mobs/Cyborgs/quadborg.yml
fenndragon Dec 28, 2024
d12a516
add
fenndragon Dec 28, 2024
68d0216
Merge branch 'Modules' of https://github.com/fenndragon/floofstation1…
fenndragon Dec 28, 2024
f7e558d
flash
fenndragon Dec 28, 2024
dea0b33
Update quadborg.yml
fenndragon Dec 28, 2024
bed0f98
Update core.yml
fenndragon Dec 29, 2024
418b37c
cc
fenndragon Dec 30, 2024
d310205
Update meta.json
fenndragon Dec 30, 2024
526d256
Merge branch 'Fansana:master' into Modules
fenndragon Dec 30, 2024
fd849c2
Update quadborg.yml
fenndragon Dec 30, 2024
08f370d
fix
fenndragon Dec 30, 2024
23987a1
f
fenndragon Dec 30, 2024
ebf3403
Update security.yml
fenndragon Jan 1, 2025
acbab9d
Update arsenal.yml
fenndragon Jan 1, 2025
6d5f4a0
Update endoskeleton.yml
fenndragon Jan 1, 2025
5b840eb
Update robotics.yml
fenndragon Jan 1, 2025
c2f5ad3
r
fenndragon Jan 1, 2025
7e6077f
Update endoskeleton.yml
fenndragon Jan 1, 2025
596255f
dude
fenndragon Jan 2, 2025
f11f9e0
there
fenndragon Jan 2, 2025
e8685ce
fix
fenndragon Jan 2, 2025
36f69ce
final
fenndragon Jan 2, 2025
4c6cb11
Update quad_suit.png
fenndragon Jan 2, 2025
bc6748e
finished
fenndragon Jan 2, 2025
febc9b0
Update lathe.yml
fenndragon Jan 2, 2025
b237859
remove recipe
fenndragon Jan 3, 2025
67b98fe
Update quadborg.yml
fenndragon Jan 4, 2025
dd0d453
sprites
fenndragon Jan 4, 2025
a7f2d5d
Update endoskeleton.yml
fenndragon Jan 4, 2025
820477a
separation
fenndragon Jan 5, 2025
f1d75e4
update
fenndragon Jan 6, 2025
8bf03cf
Update laws.ftl
fenndragon Jan 7, 2025
dc12142
Merge branch 'master' into Modules
Fansana Jan 8, 2025
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
Prev Previous commit
Next Next commit
remove recipe
fenndragon committed Jan 3, 2025
commit b237859c8ec2306c1ccd7eab00a1805fe5075026
Original file line number Diff line number Diff line change
@@ -912,7 +912,7 @@
- MagazineBoxSpecialMindbreaker
- ClothingShoesBootsSecurityMagboots # Floofstation
# Floof section - port to EE later
- WeaponEnergyShotgun
#- WeaponEnergyShotgun
- WeaponGrapplingGun # Floof
- JawsOfLife
- HandHeldMassScanner
19 changes: 9 additions & 10 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
@@ -67,16 +67,15 @@
Glass: 1000
Gold: 850

- type: latheRecipe
id: WeaponEnergyShotgun
result: WeaponEnergyShotgun
category: Weapons
completetime: 5
materials:
Steel: 2000
Glass: 1500
Gold: 1000

# - type: latheRecipe
# id: WeaponEnergyShotgun
# result: WeaponEnergyShotgun
# category: Weapons
# completetime: 5
# materials:
# Steel: 2000
# Glass: 1500
# Gold: 1000
- type: latheRecipe
id: WeaponLaserCannon
result: WeaponLaserCannon
1 change: 0 additions & 1 deletion Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -194,7 +194,6 @@
cost: 15000
recipeUnlocks:
- WeaponAdvancedLaser
- WeaponEnergyShotgun
- PortableRecharger

- type: technology