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

Selective dropper for Service Roles #1425

Closed
wants to merge 113 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
bcdd357
test
ErhardSteinhauer May 13, 2024
907fbb5
Merge branch 'new-frontiers-14:master' into 2024-05-Color-Messenger-Bags
ErhardSteinhauer May 17, 2024
df03bad
more bags
ErhardSteinhauer May 17, 2024
f32510f
Merge branch 'new-frontiers-14:master' into 2024-05-Color-Messenger-Bags
ErhardSteinhauer May 18, 2024
9ac37f7
Spesos
dvir001 May 18, 2024
96afb3f
Rubber
dvir001 May 18, 2024
1dd48b3
Fix
dvir001 May 18, 2024
f4c932f
Fixed
dvir001 May 18, 2024
1eb245a
Fix
dvir001 May 18, 2024
eab9a88
Update pistol.yml
dvir001 May 20, 2024
c716e42
FIX
dvir001 May 20, 2024
d977919
More fix
dvir001 May 20, 2024
4debe5c
fix
dvir001 May 20, 2024
9e4f103
fix
dvir001 May 20, 2024
f20009d
Add reagent whitelist to Injector component and system
blueDev2 May 24, 2024
0d0ad12
Merge branch 'new-frontiers-14:master' into Selective-Dropper
blueDev2 May 24, 2024
680eca4
Update lodge.yml
dvir001 May 25, 2024
4009fe6
Update stc.yml
dvir001 May 25, 2024
09a6dae
Update smgs.yml
dvir001 May 25, 2024
44a2767
Merge branch 'new-frontiers-14:master' into 2024-05-Color-Messenger-Bags
ErhardSteinhauer May 25, 2024
f2e56ef
initial commit
ErhardSteinhauer May 25, 2024
ad44508
Cleanup
dvir001 May 25, 2024
8e02aed
Fix antags
dvir001 May 25, 2024
dd14b53
Update face.yml
dvir001 May 25, 2024
d43ff70
Update face.yml
dvir001 May 25, 2024
9b08459
less radical updates
ErhardSteinhauer May 25, 2024
c0e38e3
added arcadia bag to vendomat
ErhardSteinhauer May 25, 2024
ac9b021
changed parenting around
ErhardSteinhauer May 26, 2024
9bd9255
Add Components, Systems, Events, and UI for Changing Reagent Whitelist
blueDev2 May 26, 2024
e2218a5
Merge branch 'Selective-Dropper' of https://github.com/blueDev2/front…
blueDev2 May 26, 2024
3f36d83
Update Resources/Prototypes/_NF/Loadouts/nfsd_loadout_groups.yml
dvir001 May 26, 2024
0b85191
Update role_loadouts.yml
dvir001 May 26, 2024
bb2c3f6
Fixed and setup client-side UI and localization. Also added new entity.
blueDev2 May 26, 2024
3e0ef4d
Cleanup unused imports
blueDev2 May 26, 2024
c0454a3
Merge branch 'new-frontiers-14:master' into Selective-Dropper
blueDev2 May 27, 2024
dd14cae
Add reset reagent button for the reagent filter UI
blueDev2 May 27, 2024
aa21f72
Merge branch 'Selective-Dropper' of https://github.com/blueDev2/front…
blueDev2 May 27, 2024
cf2b062
Fix BluespaceArcIndDataCarrier bluespace-event (#1430)
Vonsant May 27, 2024
6a1b1ea
Add this entity to service lathe and plasteel chef vendor
blueDev2 May 27, 2024
38cfb26
Fixed service lathe recipe
blueDev2 May 28, 2024
3a21e58
Change dropper rubber handle to green to distinguish from a regular d…
blueDev2 May 28, 2024
f41f9c8
ship jobs fix (#1427)
MagnusCrowe May 28, 2024
79f1b9d
Automatic Changelog (#1427)
FrontierATC May 28, 2024
9745f4c
The SBI-Crown (#1261)
UncaughtEx May 29, 2024
780a809
Automatic Changelog (#1261)
FrontierATC May 29, 2024
afdf291
increase cryo delete time (#1435)
Leander-0 May 29, 2024
a71a720
Gloves
dvir001 May 29, 2024
215b550
Revert "The SBI-Crown (#1261)" (#1441)
dvir001 May 29, 2024
6ba653a
Fix it (#1442)
dvir001 May 29, 2024
f505fc3
Make more liquids evaporate (#1407)
dvir001 May 30, 2024
6afbc0d
Fix: Clear news articles on round restart (#1428)
whatston3 May 30, 2024
ca02b29
Automatic Changelog (#1428)
FrontierATC May 30, 2024
cba410b
Removes the Helix (#1438)
UncaughtEx May 31, 2024
8d184dc
Automatic Changelog (#1438)
FrontierATC May 31, 2024
4ce6b53
Cleanup
dvir001 May 31, 2024
e506dc1
Update BlockingSystem.cs
dvir001 May 31, 2024
8c98141
fix mapping door access (#27784)
deltanedas May 8, 2024
757353e
fix wieldable guns not being able to cycle inhand (#27307)
WarMechanic Apr 26, 2024
65d63c2
Make failing to fire a gun that requires wielding not delay the next …
DrSmugleaf May 14, 2024
ed22e05
Make wielding automatically drop the item on your other hand (#27975)
DrSmugleaf May 19, 2024
4e50f97
Add loadout group check (#28311)
metalgearsloth May 27, 2024
55da5d7
Changing hands unwields item (#28161)
Errant-4 May 26, 2024
9b93ab2
Adds wielding for all large guns (#26970)
SpaceRox1244 May 10, 2024
3e6ca21
make dragons breathe fire (#26746)
deltanedas May 8, 2024
5bf59b9
Merge branch 'new-frontiers-14:master' into 2024-05-Color-Messenger-Bags
ErhardSteinhauer Jun 1, 2024
825d096
Merge pull request #1457 from dvir001/2024-06-01-BugsAndAbusePatch
GreaseMonk Jun 1, 2024
799f963
Merge pull request #1458 from dvir001/2024-06-01-DragonFire
GreaseMonk Jun 1, 2024
ad53d7c
Merge pull request #1388 from dvir001/2024-05-19-Rubber
GreaseMonk Jun 1, 2024
f30fc8f
Merge pull request #1415 from dvir001/2024-05-24-ExpoName
GreaseMonk Jun 1, 2024
7773522
Merge pull request #1416 from dvir001/2024-05-25-STC
GreaseMonk Jun 1, 2024
50e32ac
Merge pull request #1387 from dvir001/2024-05-18-ExpoRewards
GreaseMonk Jun 1, 2024
b044364
Merge pull request #1452 from dvir001/2024-05-31-ShieldAbuse
GreaseMonk Jun 1, 2024
40920df
Merge pull request #1450 from dvir001/2024-05-31-RemovePilot
GreaseMonk Jun 1, 2024
43e6c21
Merge pull request #1422 from dvir001/2024-05-25-Loadouts
GreaseMonk Jun 1, 2024
293aef4
Automatic Changelog (#1422)
FrontierATC Jun 1, 2024
3ab5923
Merge branch 'master' into 2024-05-Color-Messenger-Bags
ErhardSteinhauer Jun 1, 2024
8a03413
New Jukebox music (#1419)
Katarn1933 Jun 1, 2024
443aaca
Automatic Changelog (#1419)
FrontierATC Jun 1, 2024
5ec41da
fixes
ErhardSteinhauer Jun 1, 2024
c6f6c95
Merge pull request #1421 from ErhardSteinhauer/2024-05-Color-Messenge…
GreaseMonk Jun 1, 2024
420a920
Automatic Changelog (#1421)
FrontierATC Jun 1, 2024
6c4adee
Missing sprites for wielded guns (#1460)
ErhardSteinhauer Jun 1, 2024
e5ecfff
Automatic Changelog (#1460)
FrontierATC Jun 1, 2024
2f2cd71
Improve argenti revolver (#1451)
Leander-0 Jun 1, 2024
76aaeed
Automatic Changelog (#1451)
FrontierATC Jun 1, 2024
73e14e1
Update frontier.yml
dvir001 Jun 1, 2024
5604504
Fixed Doors
dvir001 Jun 1, 2024
4cbe507
Update access.yml
dvir001 Jun 1, 2024
938e6a6
Update heavy_rifle.yml
dvir001 Jun 1, 2024
385a45d
Merge pull request #1461 from dvir001/2024-06-01-FrontierDoors
GreaseMonk Jun 2, 2024
34adf3a
Merge pull request #1463 from dvir001/2024-06-02-SpeedLoader
GreaseMonk Jun 2, 2024
2de63cd
Merge pull request #1439 from dvir001/2024-05-29-Gloves
GreaseMonk Jun 2, 2024
79d86d4
Automatic Changelog (#1439)
FrontierATC Jun 2, 2024
1298257
PirateCove (Update) (#1462)
dvir001 Jun 3, 2024
c235a5c
Automatic Changelog (#1462)
FrontierATC Jun 3, 2024
26ed235
Ceres (Update): Restock boxes + various tweaks (#1456)
arimah Jun 3, 2024
469cf2a
Automatic Changelog (#1456)
FrontierATC Jun 3, 2024
e97e1c2
Adds Admin teleporter (#1469)
Myzumi Jun 4, 2024
9eba915
Automatic Changelog (#1469)
FrontierATC Jun 4, 2024
bae2f37
Fixes Typo (#1470)
Myzumi Jun 4, 2024
4cea1a0
Automatic Changelog (#1470)
FrontierATC Jun 4, 2024
c5a8cef
Fixup
dvir001 Jun 4, 2024
e72a8b1
Update migration.yml
dvir001 Jun 4, 2024
c1b0601
Merge pull request #1472 from dvir001/2024-06-05-Windoor
GreaseMonk Jun 5, 2024
303e256
Add reagent whitelist to Injector component and system
blueDev2 May 24, 2024
5714117
Add Components, Systems, Events, and UI for Changing Reagent Whitelist
blueDev2 May 26, 2024
1f93b7c
Fixed and setup client-side UI and localization. Also added new entity.
blueDev2 May 26, 2024
6c231f6
Cleanup unused imports
blueDev2 May 26, 2024
2957969
Add reset reagent button for the reagent filter UI
blueDev2 May 27, 2024
32cf35c
Add this entity to service lathe and plasteel chef vendor
blueDev2 May 27, 2024
e31a726
Fixed service lathe recipe
blueDev2 May 28, 2024
dfb9df4
Change dropper rubber handle to green to distinguish from a regular d…
blueDev2 May 28, 2024
c5c0839
Fix conflicts
blueDev2 Jun 5, 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
Prev Previous commit
Next Next commit
Update stc.yml
dvir001 committed May 25, 2024
commit 4009fe6557aa3fec95ed37a9d015c136fa27fbe3
6 changes: 3 additions & 3 deletions Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml
Original file line number Diff line number Diff line change
@@ -8,9 +8,9 @@
requirements:
- !type:OverallPlaytimeRequirement
time: 72000 # 20 hrs
- !type:DepartmentTimeRequirement
department: Security
time: 10800 # 3 hrs as sec
- !type:RoleTimeRequirement
role: JobSecurityGuard
time: 10800 # 3 hrs as security guard
canBeAntag: false
icon: "JobIconStc"
supervisors: job-supervisors-sr