Skip to content

Commit

Permalink
Merge branch 'master' into heal-gun
Browse files Browse the repository at this point in the history
  • Loading branch information
Stop-Signs authored Nov 15, 2024
2 parents 44aeb63 + dad219a commit ab89b60
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
Entries:
- author: leonardo-dabepis
changes:
- message: the clown has received medical treatment for his chronic snoring. No
more HONK mimimimimi
type: Remove
id: 174
time: '2023-12-20T03:01:27.0000000+00:00'
- author: deltanedas
changes:
- message: The fishops advanced user manual is now available in all finer bookstores
Expand Down Expand Up @@ -3732,3 +3725,10 @@
id: 673
time: '2024-11-14T14:28:08.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2190
- author: Fox
changes:
- message: Thieves and Sleeper Agents now need 24hrs playtime
type: Tweak
id: 674
time: '2024-11-14T18:08:37.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2193
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- Hands # the user needs to have hands to actually insert or remove a key, much like the storage implant
blacklist:
components:
- BorgChassisComponent # borgs have "hands", but can't pick stuff up so the implant would be useless for them
- BorgChassis # borgs have "hands", but can't pick stuff up so the implant would be useless for them
- type: Storage
grid:
- 0,0,0,1
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Antags/thief.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
setPreference: true
objective: roles-antag-thief-objective
guides: [ Thieves ]
requirements: # DeltaV - Playtime requirement
- !type:OverallPlaytimeRequirement
time: 86400 # DeltaV - 24 hours

- type: startingGear
id: ThiefGear
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Roles/Antags/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
setPreference: true
objective: roles-antag-syndicate-agent-sleeper-objective
guides: [ Traitors ]
requirements: #DeltaV - Playtime requirement
- !type:OverallPlaytimeRequirement
time: 86400 # DeltaV - 24 hours

# Syndicate Operative Outfit - Monkey
- type: startingGear
Expand Down

0 comments on commit ab89b60

Please sign in to comment.