Commit Graph

166 Commits

Author SHA1 Message Date
Cyprex
e6bb4098c4 Revert "Merge upstream" 2023-03-11 18:51:44 +01:00
SkyratBot
f4327644a2 [MIRROR] Fixes an oopsie with the policy update [MDB IGNORE] (#19649)
* Fixes an oopsie with the policy update

* Update job.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2023-03-04 19:54:22 -08:00
SkyratBot
34ad67a4fc [MIRROR] Updates policy to better warn players for any existing antagonist policy [MDB IGNORE] (#19341)
* Updates policy to better warn players for any existing antagonist policy

* Update job.dm

* Update job.dm

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2023-03-01 17:10:54 -08:00
Pinta
ae198af4d9 [MOSTLY MODULAR] NIFs (#18349)
* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit c2aea213fd400f9d6d12d955340cb0e7d2f9c36f, reversing
changes made to 1bb613b64a603c280abec40d9c82fde69248b196.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 10a6f906f70857cfffd9ddef7b609fecc21da902.

* we don't need this (for right now)

* Update nifsoft_shop.dm

* new nif models

* Update nif_implants.dm

* we now have items

* nice

* logging and removers

* Update nifs.dm

* nif repair surgery

* death durability loss and EMPs

* more messages and NIF TGUI fix

* polish

* debug NIF and soulcatcher polish

* new phone action sprite

* NIFs for ghost roles

* Better EMP

* this doesn't really have a good reason to be here.

* lore

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>

* Update code/controllers/subsystem/ticker.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update nif_implants.dm

* a

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update nifs_tgui.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/hivemind.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fixes an oversight

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* that wouldn't be good

* Update packs.dm

* Update nifs.dm

* Update nif_implants.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update misc_devices.dm

* Update dualboot.dm

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update hivemind.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update packs.dm

* Update prop_summoner.dm

* Update shapeshifter.dm

* Update packs.dm

* Update nif_presistance.dm

* Update prop_summoner.dm

* Update dualboot.dm

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Tastyfish <crazychris32@gmail.com>

* static data

* Update persistence.dm

* Update persistence.dm

* Update persistence.dm

* uhoh

* Update nif_presistance.dm

* Update nifs.dm

* pain

* Revert "pain"

This reverts commit 3adc919f849b68de2ab4245c7db26a02e85bf0c6.

* I don't know why this was in here

* Update nifsofts.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update shapeshifter.dm

* Update nifs.dm

* Update nifs.dm

* Update modular_skyrat/modules/modular_implants/code/nifsofts/shapeshifter.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update prop_summoner.dm

* Update misc_devices.dm

* Delete BlueShift_upper.dmm

* Update prop_summoner.dm

* Update prop_summoner.dm

* vendor

* R&D

* Update nifsoft_shop.dm

* Update dualboot.dm

* Update NifPanel.js

* Update money_sense.dm

* I'm sorry for what I must do

* Update money_sense.dm

* cost adjustments

* theme

* Update nifsoft_shop.dm

* examine fix

* examine text change

* Money Sense is now a trait

* Revert "Money Sense is now a trait"

This reverts commit 16c124ffb2cb70136abe6eb41b330d389208afa7.

* component

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* Update nifs.dm

* we do a bit of file moving

* component

* Update nifs.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit a7f7945eaa9c9ed6f9253b7cb71c6be79f3bf9e9, reversing
changes made to bca1a7f1811d3a82bf253c5a8d70431567c399a7.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit bca1a7f1811d3a82bf253c5a8d70431567c399a7, reversing
changes made to 2559afc7a9737863f7d96494e01216a1ea0f5428.

* Revert "Merge remote-tracking branch 'upstream/master' into NIFs"

This reverts commit e8293971b07a2ffbe61a7e17d5f9ac94b47ef5bc, reversing
changes made to dad4ef7a9ac697d0e887c336bd486c17fb54f2a8.

* whoops

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit c607aca6bc3e55cc724f25fa6e38011b05ebc8c6.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit b42f89b9c647d845a17732f1caaf1a50dcdd4515.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into NIFs""

This reverts commit 1d6ffe92bcaa8035f8918dc533870ec4b74ed9a3.

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* fixes things

* Update nifs.dm

* QoL

* no more summoning infinite items

* start of componentization

* Update prop_summoner.dm

* FIRMLY GRASP IT!

* Update prop_summoner.dm

* Update prop_summoner.dm

* Update nifsofts.dm

* Update prop_summoner.dm

* Update nifsoft_shop.dm

* boy, I really hope somebody got fired for that blunder

* Update nif_presistance.dm

* mistakes were made.

* Delete CentCom_skyrat_z2.dmm

* Revert "Delete CentCom_skyrat_z2.dmm"

This reverts commit 8a1cdc4b065246fb07cbaf5461d01565e0ddbe06.

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* It's a solution

* Update CentCom_skyrat_z2.dmm

* Update CentCom_skyrat_z2.dmm

* Update NifPanel.js

* Price changes

* Update nif_presistance.dm

* Such devastation, this was not my intention.

* Woooo!

* Documentation

* cryo fix

* I am sorry to anyone that had a NIF before the persistence change

* Update nif.dm

* I need to figure out why this is happening.

* Apply suggestions from code review

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* a

* Update modular_persistence.dm

* Update modular_persistence.dm

* Update nifs.dm

* Update nifs.dm

* I do the code

* Hopefully this helps

* Update ticker.dm

* Update modular_persistence.dm

* Removes client requirement

* Use brain, much better for allowing persistent organs and similar in the future.

* Did testing, it fucking works now.

* Update mind_linker.dm

* Update misc_devices.dm

* Update misc_devices.dm

* Update nifs_tgui.dm

* Thanks gamers :^)

* a

* Update nifsoft_shop.dm

* Update nifsofts.dm

* Update hivemind.dm

* Update hivemind.dm

* Update prop_summoner.dm

* whoops

* FUUUUCK

* FUCK x2

* this feels like cargo job gear

* stack trace

* roundstart fix

* Update modular_skyrat/modules/modular_implants/code/nifsofts/prop_summoner.dm

Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>

* Update modular_persistence.dm

* Update nifs.dm

* Update hivemind.dm

* Update nifs.dm

* vital spelling fix

* whoopsie

* Update nif_persistence.dm

* power_refactor

* durability refactor

* a

* Update nifsofts.dm

* pain

* Update modular_skyrat/modules/modular_implants/code/nifs.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update nifsofts.dm

* Update packs.dm

* Update nifs.dm

* Update nifs.dm

Co-authored-by: Nerevar <12636964+Nerev4r@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: RimiNosha <riminosha@gmail.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
2023-01-24 14:27:00 -08:00
SkyratBot
25f4961156 [MIRROR] Refactors memories to be less painful to add and apply, moves memory detail / text to memory subtypes. Adds some new memories to demonstrate. [MDB IGNORE] (#18487)
* Refactors memories to be less painful to add and apply, moves memory detail / text to memory subtypes. Adds some new memories to demonstrate.  (#72110)

So, a huge issue with memories and - what I personally believe is the
reason why not many have been added since their inception is - they're
very annoying to add!

Normally, adding subtypes of stuff like traumas or hallucinations are as
easy as doing just that, adding a subtype.

But memories used this factory argument passing method combined with
holding all their strings in a JSON file which made it just frustrating
to add, debug, or just mess with.

It also made it much harder to organize new memories keep it clean for
stuff like downstreams.

So I refactored it. Memories are now handled on a subtype by subtype
basis, instead of all memories being a `/datum/memory`.

Any variety of arguments can be passed into memories like addcomponent
(KWARGS) so each subtype can have their own `new` parameters.

This makes it much much easier to add a new memory. All you need to do
is make your subtype and add it somewhere. Don't need to mess with jsons
or defines or anything.

To demonstrate this, I added a few memories. Some existing memories had
their story values tweak to compensate.

Makes it way simpler to add new memories. Maybe we'll get some more fun
ones now?

🆑 Melbert
add: Roundstart captains will now memorize the code to the spare ID
safe.
add: Traitors will now memorize the location and code to their uplink.
add: Heads of staff winning a revolution will now get a memory of their
success.
add: Heads of staff and head revolutionaries who lose their respective
sides of the revolution also get a memory of their failure.
add: Completing a ritual of knowledge as a heretic grants you a quality
memory.
add: Successfully defusing a bomb now grants you a cool memory. Failing
it will also grant you a memory, though you will likely not be alive to
see it.
add: Planting bombs now increase their memory quality depending on how
cool the bomb is.
refactor: Memories have been refactored to be much easier to add.
/🆑

* Modular!

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2023-01-17 12:51:58 +13:00
Zonespace
aa441a9633 Mirror 72339 & 71284 (#18645)
* Renews a bunch of old roundend new reports that got lost. Plus, some roundend report QoL for cult and revs. (#71284)

A few roundend reports got lost from moving to dynamic and other prs.
This PRs re-allows them to occur. Namely: "Wizard Killed" (lost in
dynamic), "Blob nuked" (lost in dynamic), "Cult escaped" (lost in cult
rework), and "Nuke Ops Victory" (station destroyed via nuke) (lost from,
what I can see, an oversight / accidental swap of report values).

Additionally, small roundend report QOL for cult: Removes antag datums
from spirit realm ghosts after being dusted, so they do not show up on
the report. And in reverse, heads of staff who were dusted / destroyed
in revolution rounds are now also shown in roundend reports.

Some of these reports are dead, which is is a shame because I think
they're cool and fun.

🆑 Melbert
qol: Successfully fending off a blob now has a cross station news report
again. More pressing reports will take priority over it, though.
qol: Successfully killing a wizard (and all of their apprentices) now
has a cross station news report again.
qol: If more than half of a cultist team manages to escape on the
shuttle (rather than summoning Nar'sie), they will send a unique cross
station news report. This is still a loss, by the way. Summon Nar'sie!
qol: Nuclear Operatives successfully nuking the station now has its
unique cross station news report again, and no longer uses the generic
"The station was nuked" report.
qol: Nuking the station to stop a blob infection now has a unique cross
station news report again. Good luck convincing admins to allow this.
qol: Cult ghosts from "Spirit Realm" no longer persist on the cult's
team after being desummoned, meaning they will not show up on roundend
report.
qol: Heads of staff will now always show up on revolution roundend
report - even if their body was fully destroyed.
/🆑

* Adds support for Rulesets having intrinsic template requirements (#72339)

Title

Ensures that we load templates for a ruleset before we attempt to place
or cache characters for that ruleset
Also makes wizard and abductor async load their template to improve
(apparent) loading times for them

This is the only thing left that I can think of that would cause antags
like nukies and abductors to spawn in wrong

This should not be player facing

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2023-01-12 01:18:18 -05:00
Zonespace
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
SkyratBot
3c3774f16f [MIRROR] Makes jobconfig.toml respect values of 0 and Fixes the Generate Job Configuration verb when there's a job that wasn't in the jobconfig.toml already [MDB IGNORE] (#17161)
* Makes jobconfig.toml respect values of 0 and Fixes the Generate Job Configuration verb when there's a job that wasn't in the jobconfig.toml already (#70738)

About The Pull Request

Basically it was in the documentation of #70199 that this verb was meant for when a new job is added, or for downstreams that have more jobs than /tg/ does. So I tried to use it, and it runtimed because it didn't have one of our own jobs in the jobconfig.toml file already, thus completely defeating the point of the verb.

So I just scooted the variable declarations into the proper null-checked if block, and now it works just fine!

Also, I noticed that a job we had disabled via config wasn't getting properly disabled, turns out values of 0 in the config weren't being respected, and were getting reset to the codebase default. This behavior is now fixed, and shouldn't be an issue anymore, hopefully.

Why It's Good For The Game

Makes a useful verb, actually work for its intended usecase :)

Changelog

🆑 GoldenAlpharex
config: The Generate Job Configuration verb now works as expected when there's at least one job in-game that doesn't exist in the new jobconfig.toml file already.
fix: Any value that is set to 0 in jobconfig.toml will no longer default to the codebase's default, and will actually be considered as 0.
/🆑

* Makes jobconfig.toml respect values of 0 and Fixes the Generate Job Configuration verb when there's a job that wasn't in the jobconfig.toml already

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-10-25 22:29:03 +00:00
SkyratBot
7522903c16 [MIRROR] Seven Billion Hour Wait Time - Or, Expanded Job Config (TOML time) [MDB IGNORE] (#16962)
* Seven Billion Hour Wait Time - Or, Expanded Job Config (TOML time)

* conflict

* update modular

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-10-22 08:11:56 -07:00
SkyratBot
612568daa0 [MIRROR] Swaps sleep() to use SECONDS define [MDB IGNORE] (#16973)
* Swaps sleep() to use SECONDS define

* merge conflicts and skyrat modules

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2022-10-19 19:43:24 -04:00
SkyratBot
a00cad0164 [MIRROR] Clean up subsystem Initialize(), require an explicit result returned, give a formal way to fail (for SSlua) [MDB IGNORE] (#16248)
* Clean up subsystem Initialize(), require an explicit result returned, give a formal way to fail (for SSlua)

* [PR for MIRROR PR] Changes for 16248 (#16277)

* Merge skyrat changes, update SR SS's, and remove lobby_eye

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/autotransfer/code/autotransfer.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* restore lobby_cam for now

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: Tastyfish <crazychris32@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-09-24 17:32:40 -04:00
SkyratBot
b1bd40e760 [MIRROR] [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition> [MDB IGNORE] (#15362)
* [MDB Ignore][Bounty][Complete Refactor] Papercode Redux: Too Many Damn Files <Map Conflict Edition>

* Fixes merge conflicts and compilation errors, alongside fixing the joker card to make it fully functional again

* Fixed a bunch of info variables in map files

* Alright this is why I wanted this merged yesterday

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-04 15:50:15 +01:00
SkyratBot
5131104c88 [MIRROR] New player job selection fixes pack [MDB IGNORE] (#14818)
* New player job selection fixes pack

* Update job.dm

* Reflects the changes to our modularized Topic() proc

Co-authored-by: oranges <email@oranges.net.nz>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-07-10 08:56:20 -07:00
Gandalf
7c2a649bf7 Familiar lobbyscreen (#13835)
* wew

* e

* e

* ye

* yes

* e

* wew

* batch review, lobby > title

* yeh

* Update code/_onclick/hud/screen_objects.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/_onclick/hud/new_player.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update code/_onclick/hud/new_player.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* wew

* wew

* fixes changing title screen

* yes

* tes

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-05-26 23:29:38 +01:00
Gandalf
5fe46c9ab7 Update job.dm (#13843) 2022-05-24 01:04:36 +01:00
Gandalf
9d73d06c6a maybe replace this file with defines 2022-05-23 17:32:25 +01:00
SkyratBot
aca9ded0e0 [MIRROR] [MDB IGNORE] Reformats Access IDs for accessibility and futureproofing [MDB IGNORE] (#13751)
* [MDB IGNORE] Reformats Access IDs for accessibility and futureproofing

* ok

* fuck

* eh

* ew

* e

* this sucked

* e

Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-23 16:57:59 +01:00
SkyratBot
f9171bc2ff [MIRROR] Fixes Cook CQC + job change config fixes [MDB IGNORE] (#13592)
* Fixes Cook CQC + job change config fixes

* Update _job.dm

* Update jobs.dm

* Update department_guards.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-05-20 14:45:47 +01:00
Zonespace
2a3d60a2a6 Mirror of tgstation/tgstation#66726 (#13383)
* [MDB IGNORE] You can have your cake and eat it too. Remake of #66406 (Splitting up areas.dmi + code related stuff) (#66726)

Areas.dmi right now houses all of our mapped turfs icons (which is roughly 400 icons). Not an issue, but it's incredibly large and clunky to navigate right now. This isn't an issue for the average coder and/or player code diving, but it is for mappers wanting to add new turfs. Currently, the file has some organization, but its still an overall mess. This PR aims to slice the behemoth with multiple .dmi files corresponding to specific areas.

I also plan to repath /area/* -> /area/station/* for station turf only. This is to clean it up, as most other turfs follow this format (that being /area/turf_zone/*).

I'm also writing an update paths file as I go along.

* fixbatch 1

* fug

Co-authored-by: Jolly <70232195+Jolly-66@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-07 22:41:23 +01:00
Zonespace
48e2a3b84d [SEMI-MODULAR] Assorted OPFOR and ProgTraitor changes (#10994)
* yep

* change 3

* sure

* jbfcygjhgu

* the-end

* actually-the-end

* a space

* nyeh

* documentation

* okay

* will this compile? let's find out!

* way better

* here

* modularize

* Update code/datums/mind.dm

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>

* fix-this-shit

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-02-21 12:18:40 +00:00
SkyratBot
7b096b7672 [MIRROR] Fix random job assignments occasionally assigning to roles that were already filled. [MDB IGNORE] (#11416)
* Fix random job assignments occasionally assigning to roles that were already filled (#64734)

Missing continue in the random job assignment code meant an if statement was ineffective, code fell through and assigned roles to jobs that were already full.

* Fix random job assignments occasionally assigning to roles that were already filled.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2022-02-10 00:15:31 +00:00
SkyratBot
b3d9239670 [MIRROR] Fixes a potential "fail to setup jobs" state due to disappearing clients [MDB IGNORE] (#11375)
* Fixes a potential "fail to setup jobs" state due to disappearing clients (#64735)

Fixes a runtime error that can occur during DivideOccupations() in the event that one of the players has their clients disappear during setup due to classic byond client volatility.

If a new player's client vanishes during job setup, it will read as null instead of runtiming, which throws a JobDebug and moves onto the next player.

* Fixes a potential "fail to setup jobs" state due to disappearing clients

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2022-02-08 17:45:39 +00:00
SkyratBot
78978cac7a [MIRROR] Cleans Job lists (hardcoded and not) [MDB IGNORE] (#11318)
* Cleans Job lists (hardcoded and not)

* e

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-02-08 01:47:50 +00:00
SkyratBot
128959c65d [MIRROR] De-hardcodes jobs [MDB IGNORE] (#11155)
* De-hardcodes jobs

* De-hardcodes jobs

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2022-01-31 11:16:10 +00:00
SkyratBot
a526c6070a [MIRROR] Makes all default job titles, defines. [MDB IGNORE] (#10080)
* Makes all default job titles, defines.

* Makes all default job titles, defines.

* whitespace

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-18 16:54:03 +00:00
Zonespace
9979fc30f8 [NON-MODULAR] The flavor text requirement now doesn't let you open the latejoin menu or ready up (#10063)
* fuck

* let's do pregame too
2021-12-15 17:19:05 +00:00
ChungusGamer666
9b405a82a0 Makes the "Do your job regardless of alt title" warning extra loud and obnoxious (#9999)
* if you ignore this you are legally blind

* woops.

* even louder
2021-12-13 11:01:42 +00:00
nevimer
a2fb4eb5ab [SEMI-MODULAR]Require flavour text to join the round. (#9969)
* Place 1 missing distro pipe segment

* Revert "[MIRROR] Gasmaks tint and tint calculation update (Oranges approved edition) [MDB IGNORE] (#9817)"

This reverts commit d0987f545e.

* Revert "Revert "[MIRROR] Gasmaks tint and tint calculation update (Oranges approved edition) [MDB IGNORE] (#9817)""

This reverts commit df2c3caa41f60a6711ff59e290edc835154fcd9f.

* Require flavour text to enter the round.

* Update code/__DEFINES/jobs.dm

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>

* 150 min

* request for unicode

Co-authored-by: SkyratBot <skyratcommunity@gmail.com>
Co-authored-by: nevimer <foxmail@protonmail.com>
Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
2021-12-13 10:43:09 +00:00
SpaceVampire
3e3b7f3ae5 aaaa (#9845) 2021-12-04 02:37:49 +00:00
Tastyfish
4eefadc8b4 Alternative job titles in the Occupations screen actually used in-game (#9420)
* Added alt jobs names actually doing something.

* Also add late join announcements.

* Fix custom roles showing up first in crew monitor

* Cleanup to match upstream changes

* Updates from review, also improve both tgui manifests

* Compromise for Skyrat edit notes vs JSX vs linter

* Compromise for optimization vs not making a horrible mess of passing client around

* Follow module rules

* Revert no longer true changed to customization readme

* Update dme

* Fixed comments for alt titles
2021-11-27 22:18:45 -05:00
OrionTheFox
6c117e2d3f Modularizes HUD icons, fixes missing HUD icons & department guards' IDs (#9482)
* Fix departmental guard ID/HUD

* hudfuckeryihatethissomuch

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-11-17 03:10:18 +00:00
SkyratBot
97c8ff50ec [MIRROR] FindOccupationCandidates will no longer die if the client disappears halfway through the proc. [MDB IGNORE] (#9493)
* FindOccupationCandidates will no longer die if the client disappears halfway through the proc. (#62819)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* FindOccupationCandidates will no longer die if the client disappears halfway through the proc.

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-11-16 15:54:46 -05:00
SkyratBot
ff74ed72a1 [MIRROR] Removes cryostasis pods from the game pending creation of a proper design document [MDB IGNORE] (#9418)
* Removes cryostasis pods from the game pending creation of a proper design document

* Axe body spray

* Update ai.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-11-14 22:44:45 +00:00
SkyratBot
08bd01ea3d [MIRROR] Overhauls job eligibility checking and improves job debug logging. [MDB IGNORE] (#9348)
* Overhauls job eligibility checking and improves job debug logging.

* Fixing conflicts

* Makes Veteran the first check since it's the most likely.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-10 16:39:42 -05:00
Iamgoofball
fd577e0227 GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes (#8524)
* GoofSec: Departmental Guards, Stamina Crit Fixes, Armory Rework, 3-Hit-Stamcrit Batons, Flashbang fixes

* More realism changes to the guns.

* "lmao lets just make bullets do double damage!!!!!"

* maint-fu properly restored

* fixes disabler desc

* sagwfwdqdqa

* Departmental Guard Drip + Fixing Guard Rolling Antags

* adds the trims for the guards

* haha yes i totally forgot the knockdown

* Brute damage hardlight bullets + map fixes!

* afwefqdqwd

* fixes security armor balance lmfao

* NICE FUCKIN MERGE CONFLICT

* Big Security Armor Rework + Fixing cell swapping issues

* Space Police!

* removes 2hand from the guns for now

* Fixes Guard antag rolling.

* Stamina crit filter is back!

* Fixed vendors, 911 overhaul, Re-added sec crates to cargo

* whoops haha

* afwvwsadcwaed

* efWEFwedqadq

* bank error, you have been rewarded 20 thousand credits

Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-26 17:17:20 +01:00
Lyroy
99893bd8a8 [SEMI-MODULAR] Brings back custom Ash Walkers and Primal Podpeople, also fixes job banned species checks (#8665)
* initial commit

* whoops hahah you don't need that comment

* species check on the prefs menu

* species check actually works now, podpeople quirks

* goof was right
2021-10-13 20:32:37 +01:00
Gandalf
3d68c061ac EEEE 2021-09-26 02:58:16 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
Gandalf
8fe50110dc Reverts NTF roles and the NTF Cargo system pending OVERMAP. (#8342)
* EEEE

* Update CentCom_skyrat_z2.dmm
2021-09-23 01:17:59 +01:00
SkyratBot
124ddd7cca [MIRROR] tgui Preferences Menu + total rewrite of the preferences backend (#8153)
* tgui Preferences Menu + total rewrite of the preferences backend

* nah, we dont need to ping those people

* trying to remove the funny stuff

* unmodularizing this

* prefs reset

* this may need to be reverted, who knows

* okay, this part

* perhaps

* EEEEEEEEE

* unsanitary

* E

* Stage 1 + loadout system

* more fixes

* E

* I mean, it launches?

* More fixes and reorganisation

* E

* customisation code is spaget.

* disable ERP prefs

* Update erp_preferences.dm

* Update erp_preferences.dm

* E

* Slowly getting there

* It may be time for help :)

* tri...colors... help

* preferences now pass preferences

* Update dna.dm

* Fuck this man

* missing savefile return, set_species works, removed dumb stuff from updateappearance

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8199

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8224

* https://github.com/tgstation/tgstation/pull/61519

* https://github.com/Skyrat-SS13/Skyrat-tg/pull/8278

* e

* le butonAZARAK HELLO

* hhh

* Proper recognition where it's due, MrMelbert!

* EEEE

* examine block

* Better gen hit sounds from whitedream

* final loadout touches, more bug fixes im sure to come

* i said there would be bugfixes

* Update LoadoutManager.js

* Missing preferences in the html menu

* LIVE TESTING PHASE BABY

* Update LoadoutManager.js

* EEE

* LAUNCH TEST FIRE

* Update job.dm

* Update new_player.dm

* 50gb DAY ONE PATCH

* EEE

* Update preferences.dm

* buggle fixes

* Update examine.dm

* >LOOC starts on

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-09-23 00:40:37 +01:00
SkyratBot
e510e35167 [MIRROR] [READY] Adds memory system, and engraving walls with chisels (#8066)
* [READY] Adds memory system, and engraving walls with chisels

* EEE

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:36:51 +01:00
GoldenAlpharex
31b3a9331e [MIRROR] Replaced the lobby menu (with actual art) (#60953) (#7748)
* Replaced the lobby menu (with actual art) (#60953)

* a

* a

* Update new_player.dm

* Update new_player.dm

* Update new_player.dm

* a

* a

* Update new_player.dm

Co-authored-by: AMonkeyThatCodes <20987591+AMonkeyThatCodes@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 17:07:48 +01:00
FlamingLily
c0b967f2b4 De-snowflakes latejoin on-station code, latejoin borgs now sync properly, see #6472 (#7742)
* Revert "aaaa (#6451)"

This reverts commit f11bf3faf0.

* onstation latejoin stuff

* linking to parent AI

* test

* de-snowflaking

* Update code/modules/jobs/job_types/cyborg.dm

* Update code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update modular_skyrat/master_files/code/modules/jobs/job_types/cyborg.dm

* Update cyborg.dm

Co-authored-by: SpaceVampire <46720418+SpaceVampire@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-28 02:02:22 +01:00
ORCACommander
1ec68954f2 Patching Holes in Job Code and Config (#7802)
fixed syntax, added missing entries
2021-08-28 01:57:49 +01:00
Gandalf
a43b8c5fc4 Nanotrasen Fleet Command Expansion (#7418)
* A

* Update centcom_computers.dm

* a

* Update CommandReportConsole.js

* commandreporter

* Update command_report_computer.dm

* a

* FEET COMMAND

* a

* e

* e

* Update departments.dm

* F

* a

* a

* Update new_player.dm

* Update new_player.dm

* AAAAAA

* Update zombie.dm

* Update zombie.dm

* aaaaaaa

* 0

* a

* Update CentCom_skyrat.dmm

* aa

* Update nsstitan.dmm

* A

* Update station_goal_computer.dm

* Update station_goal_computer.dm

* Update bridge_officer.dm

* Update CentCom_skyrat.dmm

* Update pda.dm

* Revert "Update pda.dm"

This reverts commit fbe1823726f9edb7f7c3ba03c2d34b08b46ae294.

* logic

* cargo system

* 0

* Update import_console.dm

* Update cargo_skyrat.dmm

* noob coder

* Update cargo_shuttle_console.dm

* a

* Update deck_crew.dm

* Update export_console.dm

* Update deck_crew.dm

* 0

* Update CentCom_skyrat_z2.dmm

* AAAA

* 0

* Update CentCom_skyrat_z2.dmm

* Update cargo_shuttle_console.dm

* Update CentCom_skyrat_z2.dmm

* a

* SELLING CREW IS BAD.

* a

* Update supply.dm

* Update CentCom_skyrat_z2.dmm

* Update supply.dm

* A

* a

* a

* Update zombie.dm

* Update modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-08-17 18:43:19 +01:00
SkyratBot
af5dba8965 [MIRROR] Fixes joining the game with the wrong dir (#7562)
* Fixes joining the game with the wrong dir (#60816)

* Fixes joining the game with the wrong dir

Co-authored-by: Rohesie <rohesie@gmail.com>
2021-08-14 22:49:37 -04:00
SkyratBot
91070a797c [MIRROR] Job refactor 2: less hardcoded lists (#7410)
* Job refactor 2: less hardcoded lists

* CRITICAL DEP 1

* CRITCAL DEP 2

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-08-06 01:42:53 +01:00
FlamingLily
09a0205a8d [NON-MODULAR] Alt title maintenance (#7284)
* Update job.dm

* Update job.dm

* Update job.dm

* Update job.dm

* Update job.dm
2021-08-03 21:30:48 +01:00
SkyratBot
227b722820 [MIRROR] Job refactor: strings to references and typepaths [This could seriously break things :)] (#7006)
* Job refactor: strings to references and typepaths

* 0

* holy fuck

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 21:12:42 +01:00
Seris02
28935231b5 [NON-MODULAR] Fixes extra job icons, revamps those icons, adds some new ones for the others that didn't have any (#7004)
* got it workin nice

* a

* a again
2021-07-23 17:58:47 +12:00