Commit Graph

338 Commits

Author SHA1 Message Date
Debug
fd28a4853c Merge remote-tracking branch 'upstream/master' into Wizmerge-22/01
# Conflicts:
#	Resources/Maps/hammurabi.yml
2024-01-28 01:27:11 +01:00
Vasilis
57816c8ad0 Admin Observers get a hat slot and a pda (#20183)
(cherry picked from commit 69d9d9f34b262c3cd8762972faee6629071caf18)
2024-01-28 00:33:53 +01:00
Kot
f82d17ab3b Fix issue where round could reset all job priorities to high (#24340)
* Update job priorities when job requirements are getting updated

* Sort jobs by weight and then by the name

* Sort departments too

(cherry picked from commit 4f307a49be5796eaa7b02f5988a83ea04db95535)
2024-01-27 23:35:53 +01:00
deltanedas
149ad77eb5 Add TryGetPrimaryDepartment to jobs system (#23317)
* add primary departments

* make command and station specific secondary

* add a unit test

* fixy

* compile

* webedit ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit d1d11d09c7a2698fa723c11a910258f69c3d7b9e)
2024-01-26 22:48:20 +01:00
IProduceWidgets
eeb061ba57 Add the N1984 pistol (#23775)
(cherry picked from commit f39fbd48002e80a38abec16b25feefc13be11dcd)
2024-01-26 22:17:51 +01:00
lapatison
9eac67e56e Thief role description fix (#23509)
(cherry picked from commit 0603115ccbb5132ba44d5f977bb3bce86eafa3d9)
2024-01-26 21:37:19 +01:00
Debug
42d38fea90 Fix paramedic spawing with wrong backpack (#710)
Update paramedic.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-22 20:30:23 +00:00
Nemanja
70a165f9af Fold cosmetic sunglasses into regular sunglasses (#23232)
Fold cosmetic sunglasses into regular sunglasses.

(cherry picked from commit f7a923624a17c72454f0f43bbfd24c80b8c5e007)
2024-01-22 21:02:31 +01:00
deltanedas
b7ce6cdbd1 exterminator midround minor antag (#19946)
* terminator locale

* terminate objective

* terminator components and shared system

* terminator roles rules and system

* terminator events

* skeleton recolour

* terminator and endoskeleton

* ghost role spawn

* damage modifier sets

* :trollface:

* :trollface:

* add antag prototype

* ghost role locale

* skynet

* :trollface:

* :trollface:

* :trollface:

* add endoskeleton body prototype

* :trollface:

* :trollface:

* smite locale

* implement terminate smite

* :trollface:

* :trollface:

* implement PopupBehavior

* endoskeleton transform popup

* move stuff from shared to server since nothing actually used it

* recolour everything

* update parts

* :trollface:

* :trollface:

* ok fire was using the damage set, back to 1.0

* tweak

* :trollface:

* :trollface:

* simplemob ops

* 1 rule per pro

* :trollface:

* :trollface:

* update some sprites

* structural damage

* :trollface:

* :trollface:

* Revert "update some sprites"

This reverts commit 459196c6a8942c5412885d5fe2f1a83a48408ddc.

* offbrand, add die objective to maybe remove fear of murderbone

* add shut down objective to the list

* fix ghost role

* fix control mob

* :trollface:

* :trollface:

* please

* naming

* code changes for GenericAntag terminator

* yml changes for GenericAntag terminator

* :trollface:

* moved kill objective override to an objective component

* use kill objective override

* fix

* oh

* locale changes

* change burn to heat for skin melting gib

* change some endoskeleton stuff

* pro

* i already did this dementia ops

* objective

* fix

* pro

* swap out full sprite

* update parts

* forgor

* fix mind transfer

* type

* endoskeleton has 500 mass

* evil

* fishops

* warops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 52532e40759d874e25daf1620ad5d808b0942116)
2024-01-22 18:36:12 +01:00
Nairod
050635552d Central Command Access, Doors, and Locked Vendor (#22924)
* CentComm Acess and Doors

* Central Command Access Windoor

(cherry picked from commit a1210ca69135b6cff3db95a6be7a07db88e4e338)
2024-01-22 18:34:37 +01:00
Ed
8bca049ca7 New Thief minor antagonist (#21520)
* start working

* add right-click thief antagins
some architecture restruct

* add meh thief greeting audio

* add thief subgamemode to Traitors gamemode

* add late join thief (not tested yet)
add briefing

* add pacifism

* add Steal tasks to thief

* fix crash thief+traitor on person

* add new condition: collection steal

* add tracking of succes collection objective

* add stamp collection target
remove some boring steal target
add check pulling entity to collection target

* finalize first 2 group objective

* start merging stealing objective systems

* merging

* finish merging. Now traitor steal objective work better

* we don't check the items of pullable sentient entity

* clear naming, enable thief signle item objective start

* objective pack add

* finish with steal item objectives

* convert string to ProtoId<>

* some clean up

* add thieves to revolution game mode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>

* update pacifism: fix crashing, monkey-thief without pacified

* adaptive animal briefing, cleaning locales

* add structure steal objectives

* remove RCD target

* add thiefs to manifest, but bug with traitor duplications

* add escape objective

* add chat briefing

* setup animal objective group system

* add animal steal objectives

* add animal objectives notroleconditions

* add morty

* now thief mode has a chance of not launching Now there are a random number of thieves per round from 1 to 3

* 6 hours of trying to fix duplicate tasks. Failure

* added thief pinpointer (buggy)

* start thief backpack UI work

* revert pinpointer for scope reason

* UI continue work

* add thief starter kits content

* remove ERP kit :trollface:

* finally! giving starting items to thief. Now it playable, but still need more work

* clean up

* fix

* fox

* add merged items into thief
new Starting Kit (buggy)

* fix YES antag menu

* objection tweaks

* remove hearts objective, working on spawning things from toolbox

* smug

* fixes

* add race specifier objective condition LAMPS

* meh

* fix fix fix

* the alive

* Adding stamps

* Update backpack.ftl

* Revert1

* Revert ftl

* add voice mask to communicator kit

* Update Resources/Locale/en-US/administration/antag.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-thief.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/conditions/steal.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/prototypes/roles/antags.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update Resources/Locale/en-US/thief/backpack.ftl

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* update

* fix

* more reusable function, add documentation

* fix doc

* faint fixes

---------

Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

(cherry picked from commit 144af233c4f4135cccacfa5d50281fce44a1595e)
2024-01-22 18:30:44 +01:00
Velcroboy
1b1745b41c Add Chef's Belt (#22868)
* Add Chef's Belt

* Reduce contents in filled belt to just s&p

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

(cherry picked from commit dfa71af1f85e49c6017618c68d960b5cfc6897d9)
2024-01-22 18:27:05 +01:00
Debug
18f0af1f68 Implement gridinv, proper (#703)
* Implement gridinv, 1500 squashed commits :elp:

* Me when

* Linter errors

* Fix katana belts
2024-01-21 19:58:28 +01:00
Emisse
eff8b9c799 remove base agent id from nukie operatives (#22811)
remove base agent id
2023-12-22 23:16:27 +01:00
Kevin Zheng
16cce7a1fa Give security sunglasses the security HUD (#19904)
* Give security sunglasses the security HUD

* Switch security to round-start sunglasses, add sec glasses research
2023-12-22 22:59:08 +01:00
Ubaser
3f3394ae76 Rubber gloves for janitors (#22668)
* add

* fix

* formatting..
2023-12-22 22:55:22 +01:00
leo
560120a257 No more "HONK mimimimimi" for the clown (#574)
Update clown.yml
2023-12-19 21:01:26 -06:00
Debug
af2e0475d9 Revert "give command staff brig access (#22230)"
This reverts commit 9dfbd8f4ff.
2023-12-16 21:11:42 +01:00
Errant
1818b19687 Blood-red medic armor ID change (#22422)
* Rename blood-red medic hardsuit prototype

* Update guidebook

* Migration
2023-12-16 20:11:11 +01:00
IProduceWidgets
72d128ce83 Make ERT PDAs and give them to the right presets. (#22392)
* Pdas made

* ID cards

* Role fills

* Trim Item heldPrefix overrides.

* Sorta funky parenting.
2023-12-16 20:08:40 +01:00
Whisper
4749a69050 Adds cosmetic sunglasses (#22311)
* Adds cosmetic sunglasses

* oops
2023-12-16 19:47:54 +01:00
Emisse
9dfbd8f4ff give command staff brig access (#22230)
* lort

* webedit ops

* pro

* Update research_director.yml
2023-12-16 19:34:13 +01:00
brainfood1183
68e05fcb9d Banana Clown Outfit (#22068)
* Banana Clown Outfit

* Update SkatesComponent.cs
2023-12-16 19:18:41 +01:00
Debug
8a6d7bbb24 Prisoners require whitelist (#528)
* Update warden.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>

* Update prisoner.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>

* Update gladiator.yml

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>

---------

Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2023-12-07 13:22:03 +00:00
Bakke
003f262562 Bring back the prisoner role (#511)
* Revert "Removes Prisoner selection from maps (#262)"

This reverts commit d73f485fa2.

* Fix alwaysUseSpawner, add DesiredSpawnPointType

Prisoners are now forced to spawn in the prison again.

* Updated map prototypes for prisoner

Yaaay, we love confinement!

* Update asterisk.yml

Add a drain to the cell area :trollface:

---------

Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-12-06 16:54:36 +01:00
Ubaser
375aec45d6 Improve/fix senior physician beret (#22051)
* add

* fix error

* Revert "fix error"

This reverts commit 19580047c0e2f4b3daed7a4e8324fc5c240c81f1.

* readd

* change name

* typo
2023-12-02 20:33:27 +01:00
Ubaser
b5fbee7d96 add custom PDA for nukie medic (#22016) 2023-12-02 20:33:25 +01:00
Ubaser
87c482ab66 Add papercut-proof gloves for the HoP (#21915)
* add

* fix fr

* resolve error

* maybe now..?

* step 1

* step 2

* fix fiber
2023-12-02 20:25:38 +01:00
Colin-Tel
ad28799c40 Role accesses and starting equipment (#456)
* Role accesses and starting equipment

changed some accesses, changed some equipment

* Update service_worker.yml

changed the service worker outfit

* comments

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-25 19:21:47 -06:00
Velcroboy
ce00812d95 Adds robust granular access (#470)
* Adds robust granular access

* Updates drobes with appropriate access

* Typo/file not saved

* Remove dupe/copy-paste oops

* Remove dupe/copy-paste oops

* Remove dupe/copy-paste oops

* Revert "Typo/file not saved"

This reverts commit 190363ead8db415e1d0e06e27b884cbcf835a398.

* Revert "Revert "Typo/file not saved""

This reverts commit dd116f2b04f48d3dad97dc4e57a56a3ed1234e7d.

* Revert "Remove dupe/copy-paste oops"

This reverts commit 5660903ac46f920efc73bea2f217c5ad50268c96.

* Remove dupe, fix copy/paste

* Fix some more copy/paste

* ugg

---------

Co-authored-by: Jeff <>
2023-11-25 18:49:26 -06:00
Velcroboy
142598394e Remove brig access for lawyer (#467)
* Remove brig access for lawyer

* Better

* Nyano/DV files

* Update Colin maps

* all other maps

lawyer/service airlocks

* Update edge.yml

got rid of invalid linkedports

* untouched maps w/ pending changes

---------

Co-authored-by: Jeff <>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-22 10:07:59 -06:00
Colin-Tel
80857f3d7b Update quartermaster.yml 2023-11-19 16:43:59 -06:00
Emisse
10c6bce016 Update lawyer.yml (#21736) 2023-11-19 22:22:01 +01:00
lzk
2a73645483 Return service access to librarian (#21710)
* Update librarian.yml

* return brig line where it belongs to be
2023-11-19 22:22:00 +01:00
Velcroboy
51c63c161d Access/Airlock Revamp (#21701)
* Access/Airlock Revamp

* Fix migration error, and update IDCardConsoleComp

* Goofed on that one

* Requested changes

* Ooops

* Undo migration

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2023-11-19 22:21:28 +01:00
Emisse
7e99c073dd remove qm externals access (#21677) 2023-11-19 22:12:30 +01:00
Whisper
4dbbd68af4 update death squad role description for more universal uses. (#21611)
* update death squad role description for more universal uses.

* caps

* replace security glasses with sechud so they can see eachother
2023-11-19 22:03:01 +01:00
Colin-Tel
dbb125094e Update head_of_personnel.yml (#450) 2023-11-17 23:56:56 +00:00
lzk
40387dad9d Remove welding mask from tech assistant starting inventory (#21578) 2023-11-12 20:55:34 +01:00
brainfood1183
f101e30565 diagonal window glass and pirate shuttle improvements (#21174)
* shuttle and priate improvements

* fix

* fix damn ubuntu

* darkened syndi airlocks

* fix

* fix ruranium

* added prison cell to pirate ship
2023-11-12 20:43:49 +01:00
IntegerTempest
4a8dc35b1d Nukeops hud (#21260)
* a

* a

* a2

* syndi visor

* left icon

* a3
2023-11-12 20:43:48 +01:00
TsjipTsjip
b6ac69b86e SO gets sec beret (#21433) 2023-11-12 20:38:39 +01:00
Ubaser
14a21d3b67 Senior Physician Beret (#21426)
* add

* fix
2023-11-12 20:35:52 +01:00
leo
aac53fe983 Add time requirement for Technical Assistant (#383)
* Update technical_assistant.yml

* Update technical_assistant.yml

* Update Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

* Update technical_assistant.yml

attempt 2 to untouch line

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
2023-11-02 11:15:06 -05:00
Whisper
c2c6265b33 fix cburn bag issue, make new bag entity for them and filled bag entity (#21295) 2023-10-31 19:12:40 +01:00
Whisper
638054c8e9 ERT Loadout overhaul + Real deathsquad mobs + ERT fixes (#21230)
* "assist with medical efforts"

* CentComm official description change

* give cburn ert mask

* Ert medic hardsuit uses blood-red medic values

* description changes, they all used to use the blood-red description

* ert engineer hardsuit uses cburn values, good for handling all possible engineering problems.

* janitor hardsuit uses cburn values for extreme messes, otherwise we'd send the non eva variant.

* spawn suffix changes

* shorten suffix

* drop armor from ert jumpsuits

* drop armor from DS jumpsuit

* add more armor to death squad to make up for removed armor in the uniform.

* give sec gas masks armor, give syndicate gas masks armor. ERT gas mask uses syndicate mask values

* add nanotrasen

* removed duplicate

* give centcom IDs their hud icon

* replace all ert bulletproof armor with basic universal armor

* replace all oxygen tanks with air tanks; species is random.

* remove gun and meds from ert engineer kit

* give ert engineer materials

* remove weapons and meds from janitor ert

* give ert janitor light replacer

* remove ert sec pulse weapons, admins will assign loadout. Either the lecter or enforcer, probably.

* Give ert sec the security pistol kit

* typo

* give eva ert sec pistol

* give eva janitor ert gas mask

* give jani purple gloves

* medical gloves for medical ert

* replicate security loadout to leader

* quick ert lecter spawns for lazy admins

* better suffixes to find them easier

* add cburn to ertspawn

* Replace "Spawn" with "role"

* Add death squad. Give ert engineer gas analyzer.

* death squad using wrong equipment

* typo

* missing ghost roles on lecter loadouts

* add freedom implanter to deathsquad

* deathsquad ghost role text

* Operative sounds better

* give Ds flashbang box (why isn't it entirely filled?)

* fix typo. add energy shield to DS

* fix typos

* all centcomm roles are now mindshielded. These cannot be removed.

* Rider didnt include some of the changes ?

* give zipties instead of cuffs for mass arrests!

* upgrade ERT survival boxes to extended capacity

* give cburn extended oxygen too
2023-10-31 18:54:29 +01:00
Adrian16199
9bfcf80167 Changes Head of Personal's job prioritization. (#363)
* Changes Head of Personal's job prioritization.

A change so that it doesnt prioritize everything as much as they would be a captain like one on job list selection before the round starts.

* uh, yes, forgot comment.

* Changed the comment to floofers's one because i like it more.

* deleted one #
2023-10-31 12:38:20 -05:00
Colin-Tel
21e7b9bb14 Some lose antag some gain access (#359) 2023-10-30 08:45:59 -05:00
Fluffiest Floofers
ed2213f6e7 Update the station specific jobs description (#351)
* update

* brigmedic can get map dependent for now

* typo

* forgor
2023-10-29 04:02:52 +01:00
Fluffiest Floofers
0c2fb8429a Fixes MG missing telepathic chat and dispel power (#288)
* Fixes

* lmao later
2023-10-26 09:55:52 -05:00