Commit Graph

3252 Commits

Author SHA1 Message Date
Katherine Kiefer
d68c6455f7 Merge remote-tracking branch 'origin/master' into luciee 2022-03-31 10:48:29 +11:00
adamsong
818ab4d2d2 VV works again (#13491)
* VV works again

* Fix some more I missed
2022-03-23 16:51:30 -05:00
Katherine Kiefer
d729760ecf Merge remote-tracking branch 'origin/master' into luciee 2022-03-21 09:38:47 +11:00
adamsong
f1e1e66bf7 Remove the requirement of 2FA to open the permissions panel, editing anything still requires 2FA (#13399) 2022-03-13 11:25:49 +00:00
adamsong
e5a1515de1 Refactors VV (#13312)
* Refactors VV

* Copied more tg code

* Fixes renameing by copying more tg code

* Copies some code from yogs this time
2022-03-13 11:22:11 +00:00
Lucy
3d4f24603d Merge branch 'master' of https://github.com/yogstation13/Yogstation into katmos 2022-02-15 19:48:11 -05:00
Chubbygummibear
6c5d7e8edf Gives Ethereals face shape options and access to hair gradients (#13215)
* PLEASE GOD JUST WORK PLEASE

* YES?

* oh my god it works

* should resolve the merge conflic, also the diamond was of a different darkeness woopsie

* YOOO THEY DON'T GET HIDDEN BY PARTIAL FACE OBSCURITY ANYMORE. SEC HELMETS AND TOGGLED BALACLAVAS WORK
2022-02-05 15:29:19 +00:00
ChesterTheCheesy
4d369ae1db Eldritch horror - the final PR (#13033)
* Update is_helpers.dm

* Update role_preferences.dm

* Update traits.dm

* Update names.dm

* Update traumas.dm

* Update miscellaneous.dm

* Update scanners.dm

* Update sql_ban_system.dm

* Add files via upload

* Update headcrab.dm

* Update panacea.dm

* Create e

* Delete e

* adds horror

* Add files via upload

* Update suicide.dm

* Add files via upload

* Update brain_item.dm

* Update death.dm

* Update human.dm

* Update transform_procs.dm

* Update gun.dm

* Update organ_manipulation.dm

* Update uplink_items.dm

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Create horror.txt

* Add files via upload

* Update yogstation.dme

* adds horror-relatated tips

* fixes a typo

* Update code/_onclick/hud/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/game/objects/effects/temporary_visuals/miscellaneous.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update code/modules/antagonists/horror/horror.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* Update scanners.dm

* Update code/modules/antagonists/changeling/powers/headcrab.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

* i hope this won't break again

* actually makes horror unable to force lings to suicide

* fixes duplicate definition

* Not needed, changeling code already checks for that

* Cleans up a lot of code

* thank you theos for absolutely nerfing the crap out of horror tentacle

* cleans up a lot of bibby's suggestions and fixes a few bugs

* not sure if i changed anything in this file, but fuck it

* lets fix that merge conflict

* i sure hope github doesn't go nuclear

* oops made horror unable to work

* i hate logic gates

* sorry for commit spam but this thing literally broke horror and i wanna fix it as soon as possibles

* HAHA STUPID DE MORGAN! (tested works as intended)

* abominations summoned by curator horn should not attack horror anymore

* adds missing "

* cannot use lube ability whilst dead anymore

* Update horror_abilities_and_upgrades.dm

* flailing lube stops when you're killed while doing it

* fixes ordering so you can't get stuck in wrong animation at the last spin

* Horror can no longer squeeze through welded airlocks

* Infesting people is now assigned to Alt+Click

* makes tentacle arm no longer affected by range multipliers

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2022-02-02 18:44:08 +00:00
Xoxeyos
6aa0355b5c My brain hurts - Dynamic fixes, small additions to station traits to make dynamic not cry. (#13150)
* Update yogs_lobby_music.txt

* Update yogs_lobby_music.txt

* summary

* Station Trait addition because dynamic cried

* quick edit

* Update dynamic.dm

* Update dynamic_rulesets.dm

* Adds a mininum player count to darkspawn
2022-02-02 18:34:32 +00:00
Xoxeyos
7b57ff8976 Federation, not Foundation. (#13126)
* Update yogs_lobby_music.txt

* Update yogs_lobby_music.txt

* heresy machine, heresy

* Update one_click_antag.dm

* Can you brave the light?
2022-01-26 18:58:40 +00:00
adamsong
4fbfbf77b8 [admin] Adds simple message to the player when a ticket is taken (#12953)
* Adds simple message to the player when a ticket is taken

* Stupid linter
2021-12-26 12:16:34 +00:00
Lucy
3ef9b39d56 clean up some GLOB.gas_data.names stuff 2021-12-20 22:57:22 -05:00
Lucy
a50cbe7281 auxtools and katmos! 2021-12-17 17:59:11 -05:00
adamsong
edd5c099c3 Fixed admin message for MFA reset using the wrong variable (#12801) 2021-12-11 16:14:40 +00:00
Lucy
84ff9c6d50 Infiltration game mode (#12270)
* Infiltrators!

* Fix the cigarette vending machine in the infiltrator base

* Uncomment role preference

* Fix a bunch of bugs.

* Changes to AI hijack

* GODDAMIT I FORGOT TO SAVE IN STRONGDMM

* Fix the dumb gravgen runtime.

* Just throw the infiltrator base on centcom directly

* Add infiltrators to one-click antag (and fix vampires not being in it)

* blame jamie

* add infiltrators event

* Admin only for now.

Admin only for now.

* Maybe fix the round ending a BIT too early?

* Fix uplink not appearing properly in the roundend report

* Improve examine text for infiltrator power sink

* Whoops, remove the J

* More stuff.

* Jamie's map changes

* Make the AI hijacker more idiot-proof.

* Update map again.

* fix infiltrators not being able to use edaggers

* Update centcomm map again

* aaaaa

* fix powersink examine

* e

* wait nvm that's right

* big typo whoopsie

* Some big ol' improvements!

* some tweaks to infiltrator uplink items

* Use span defines, some hijacked AI stuff...

* infiltration implants! woohoo!

* fix pinpointer to objectives not working

* dammit actually fix the pinpointer

* New pinpointer sprite!

* new sprites!

* Finishing all objectives no longer finishes the round.

* Fix sprite

* fixy fixy

* you can now put TC into your uplink

* restrict holoparas for infiltrators

* Fix infiltration implant creating a bugged implant case

* Fix CTF; add another infiltrator item spawnpoint

* tweak shuttle a bit

* you can no longer hijack dead AIs; 3rd item spawnpoint is now on the shuttle

* prevent using PDAs to metagame

* no removing purrbation

* hijacked ais can no longer doomsday; infiltrator objectives now properly respect quiet round

* make kidnap code slightly better

* show to ghosts

* remove cornered donuts in infiltrator ship

* fix up objective code stuff

* fix telecrystal thing still not working

* Add to config

* add minimum age of 3 weeks; add dynamic ruleset copy-pasted from nukies

* nvm i'm too lazy to figure out how this works

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-12-04 17:42:36 -05:00
nmajask
ad727f54dc Fixes some IDs not having original assignments (#12761)
* Gives more IDs alt titles

Now less things should be broken in the crew monitor and sec huds

* Fixed job outfits giving IDs with no original assignment

Should fix job outfits giving IDs with no original assignment if the person does not have an assigned role.
2021-12-02 15:30:38 -05:00
ynot01
758d4c95de [admin] Traitor Panel obj text is now green/red depending if the game considers the objective complete (#12671)
* Update antag_panel.dm

* add (COMPLETED)

* removes a bad space
2021-11-18 20:12:56 +01:00
adamsong
f17edec899 Fixes mods being told they need +VAREDIT for check antags (#12683) 2021-11-18 20:07:14 +01:00
adamsong
dd6ba46e62 Bugfixes with permissions editing (#12674)
* Added 2FA to editing someone's rank, to prevent using the player panel to bypass the check on the permissions panel. Also fixed bug where pressing 'Cancel' on adding a new min would leave them in a limbo state

* Fixed function call
2021-11-16 10:05:18 -05:00
Theos
1960619f29 Removes overthrow (#12611)
* it's gone

* adios

* this mode sucks

* adios

* goodbye

* gone

* it's fiction

* Update antagonists.dm

* adios

* Update ai_laws.dm

* it's gone

* gone, reduced to atoms
2021-11-14 18:03:39 +00:00
adamsong
33e7d1c704 Webedit quickfix for long ban reasons causing bans to break (#12550)
* Webedit quickfix for long ban reasons causing bans to break

* I am bad at code
2021-10-31 13:25:44 +00:00
adamsong
fdc4c88795 Errors for mfa now go to Log_Admin as well, so the admin failing to log in can see why (#12523) 2021-10-29 13:18:23 +02:00
adamsong
d940c3ebc7 Adds TOTP MFA for admins. (#12363)
* Adds discord based MFA for admins.

* Fixes error caused by the yogstation folder, other small errors

* Fixed SQL error, I hope

* Converts to TOTP

* Got 2FA working, as well as the backup codes

* Didn't mean to commit this

* Added QR code for scanning in the TOTP seed, removed debug statement, added reset to the permissions panel. Locked the permissions panel behind 2FA.

* Catches error messages from rust_g

* Update rust_g

* Adds 30 day expiry to sessions, also re-disables SQL and MFA in private_default

* Make persisting the session opt-in

* Adds a way for a user to clear their saved logins

* Update rust_g.dll now that the other PR was merged

* Refactor 2FA off the admin datum

* Removed extra check on the 2FA reset button

* Update database_changelog.txt
2021-10-24 15:09:57 +01:00
nmajask
eac2f12278 Moves many icons out of items_and_weapons.dmi and reorganizes it (#12372)
* Moved some icons out of items_and_weapons.dmi

Organized some stuff

* Moved more icons and reorganized it

I cant list everything I changed, but i moved stuff
2021-09-27 00:38:27 -04:00
adamsong
3c4e6488cc Allow mods to soft reboot the server, also allows admins to reboot the server ignoring tickets (#12299)
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-17 13:14:12 +01:00
adamsong
a0704b9f18 [admin] Revamp auto deadmin (#12286)
* Adds a minimum admin count to auto-deadmin, also adds a preference for auto-deadmin on critical roles

* Disables the forced deadmin, increases the threshold

* Changed config to be the minimum to auto-deadming, as its more intuitive

* Remove drone from silicon auto-deadmin

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-17 13:13:32 +01:00
adamsong
3baeaeb0c4 Steals tg's span macros (#12232)
* Steals tg's span macros

* Fix alphabet

* Updated some more spans

* Misses a conflict

* Fix compile errors

* Converts more spans

* oops
2021-09-17 12:50:16 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
Jamie D
5cb4c27eee Makes deadchat its own ban instead of OOC (#12248) 2021-09-06 12:44:05 +01:00
adamsong
7756fcbbbb [admin] Port ahelp tickets panels to TGUI (#12084)
* Start porting admin ticket panel to TGUI

* Forgot to tick new file

* Admin ticket viewer works now

* Added individual ticket viewer as well

* Fix linter errors

* Actually saved changes this time

* Hopefully linter is happy

* Fixed crash when client disconnects

* Committing changes for now

* Adds some more buttons to both panels, fixes disabling the buttons, adds filters to the ticket list

* Fix some linter errors

* Fix indentation

* Fixed indenting this time, I hope

* Remove html from teleport ticket log

* Added line break, changed TP icon

* Remove reply button

* Makes ticket panel thicc

* Little bit less thicc

* Reverses ticket list

* Hopefully removes html from tickets

* Remove extra parenthesis

* Should fix tests

* Improve the ui

* Actually ran the linter this time
2021-09-04 14:58:58 +01:00
Jamie D
ca9f2eb352 Revert "[admin] Admins now have the right to tell people to man up. (#11648)" (#12122)
This reverts commit e2e142055b.
2021-08-24 10:00:22 +01:00
Jamie D
0b601e5a5d Adds Custom Mentor role, can Add Wiki and Stuff now (#12014)
* Adds Custom Mentor role, can Add Wiki and Stuff now

* HAPPY ALEX?

* BugFix One

* FUCKING OOPS

* Should Fix

* e

* e

* Reeee

* e

* e

* ee

* godsake
2021-08-21 13:29:13 +01:00
Jamie D
ec9e889d46 Job Alternative Titles (#11973)
* Job Alternative Titles

* e

* Jamie is bad at coding, alternate titles now works

* Makes code better, should be good now

* FUCKING JOB TITLES - KILL ME

* CHANGES

* Might fix borgs

* Update code/modules/jobs/jobs.dm to prevent merge conflicts

* BugFixes! Woohooo!

* Bugfix 2

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: adamsong <adamsong@users.noreply.github.com>
2021-08-19 21:24:07 +01:00
adamsong
342ca53006 [admin] Disconnect panel (#12047)
* Added connection history storage

* Adds the actual tgui window, starts dev on it

* Adds more to the UI

* Makes the button work

* Fixed some linter errors

* Fixes more linter errors

* Trying again

* Eventually

* This linter will be the death of me

* Hopefully linter happy

* Fixed some small bugs on the panel itself, added debug for buttons

* I fucking hate the linter

* remove debug prints

* Update code/modules/admin/verbs/disconnectpanel.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

Co-authored-by: Hopekz <hopekxx@gmail.com>
2021-08-19 10:17:55 +01:00
adamsong
4ec30dd702 Makes grant full access work on simplemobs (#12011)
* Makes grant full access work on simplemobs

* Fixed grant AA, added debug ID

* Autodoc
2021-08-16 17:22:16 +01:00
adamsong
a72ce07e42 Makes the door opening for ERTs run async (#11981)
* Makes the door opening for ERTs run async

* Remove useless tick checking
2021-08-14 13:35:59 +01:00
Jamie D
b8e7ffa3df Demotes Adam from Host (#11992)
* Update permissionedit.dm

* e
2021-08-09 19:44:42 -04:00
adamsong
9690382473 [admin] Hopefully makes admin ranks able to have spaces (#11962)
* Hopefully makes admin ranks able to have spaces

* Made the configs not have to be ugly, tested code
2021-08-07 12:36:34 +01:00
Jamie D
1f44066dce [Admin] Gives admins the ability to change AI/Robot Laws at will (#11803)
* Update borgpanel.dm

* oopsie

* Better Code
2021-08-07 12:06:32 +01:00
alexkar598
db9d6e8687 [admin] Added a command to fix air on the whole zlevel, disabling atmos to do so safely - Alexkar598 better code edition (#11934)
* Added a command to fix air on the whole zlevel, disabling atmos to do so safely

* Optimization and confirmation

* This is no longer the case as not all of them need to be negated

* Use default behaviour for check_rights

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
2021-08-06 20:34:06 -04:00
TheGamerdk
85b82aa53f Update admin_verbs.dm (#11844) 2021-07-20 18:32:17 -04:00
adamsong
95c3688cae Fix stealthmin ghosts and dsay (#11751)
* Makes invisible stealthmin ghosts apply to ghosts made after stealthing

* Makes fake ckey and random name appear in admin dchat when stealthed
2021-07-13 19:16:23 +01:00
Xoxeyos
4374b935ce Dynamic 2021 & Ghost Pool Protection (#11139)
* Please let this work

Good luck to myself, Xoxeyos

* This shit is fucking abhorrent

Admin.dm, rust_g, game.dm, mobs.dm, pai.dm, dynamic folder, holy_weapons.dm, admin_verbs.dm, topic.dm, ghost_pool_protection, antag_datum.dm, CTF.dm, corpse.dm, _event.dm, living/brain/posibrain.dm, giant_spider.dm, dynamic.json

* Why is this here?

* Update dynamic_rulesets_roundstart.dm

* Merges Dynamic 2021 final fixes

* Will this work?

* Maybe this might work.

* This was suggested as a change.

* Fixes bad bugs

* Easy enough.

* Update ghost_pool_protection.dm

* Update ghost_pool_protection.dm

* Update dynamic.dm

* Update dynamic.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic.dm

* Update dynamic_rulesets_roundstart.dm

* I can put in sound_enviroment when I figure out what it is

* Update mob_defines.dm

* Update mob_defines.dm

* Update mob_defines.dm

* Security and Command personnel rolled infiltrator again

* Update dynamic.dm

* Ports over https://github.com/tgstation/tgstation/pull/58644 - No more mass infiltrations?

This is an attempt to keep infiltrators from spawning in nonstop.

* Update ruleset_picking.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* weight configurement

* weight configurement

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets.dm

* Update dynamic.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets.dm

* Update new_player.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_roundstart.dm

* Update dynamic_rulesets_latejoin.dm

* Update dynamic_rulesets_roundstart.dm

* Adds from logging from https://github.com/tgstation/tgstation/pull/58451/

* Finishes up adding https://github.com/tgstation/tgstation/pull/58451/

* Update dynamic_rulesets_midround.dm

* Update dynamic_rulesets_midround.dm

Co-authored-by: Redmoogle <dakotamew@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-07-09 10:49:41 +01:00
JC Denthead
e2e142055b [admin] Admins now have the right to tell people to man up. (#11648)
* Admins have the right to give people heart attacks.

* Presumably fixes the category being outdated as fuck.

* Changes "R_ADMIN" to "R_FUN".

* Update code/modules/admin/admin.dm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-07-07 12:17:40 +01:00
Jamie D
24d1f239ea Take 2 (#11702) 2021-07-03 10:49:41 +01:00
Jamie D
b34fc83632 Adds new Smite for Admins (#11689)
* Whistle

* eeee
2021-07-02 06:09:23 -04:00
Maxim Nikitin
7013fa39d5 Voice Announcement System for AIs and Captains (#11548)
* Voice Announcement System

* Fixes shit the linter complained about

* Uses topic instead of JSON files

* fixes alex's problems

* use /dev/urandom on linux

* GenerateToken

* update the config in theory

* Allow downloading sounds via Get Server Logs
2021-07-01 11:46:27 +01:00
alexkar598
0b61881f61 Allows admin to use HTML in centcom reports (#11624)
* Update priority_announce.dm

* Update randomverbs.dm
2021-06-26 11:37:57 +01:00
Maxim Nikitin
7e8bea4001 [admin] Adds missing button to toggle exempt from job exp requirements (#11532)
* [admin] Adds button to toggle exempt from playtime exp requirements

* Update code/modules/admin/admin.dm

Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
Co-authored-by: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com>
2021-06-13 11:50:26 +01:00
alexkar598
bb3d4a564f Ports 514 compat from beestation (#11544)
* Yoinks all the shit man

* Hopefully shuts CI the fuck up

* Bins this stupid shit

* Fixes

* Windows too, I GUESS

* fixes airlock alpha filter breaking on 514 (#4441)

* fix

This manually sets the alpha 0 and alpha 255 correctly as this feature of the alpha filter does not seem to work correctly on 514.

* small comment change

* Update airlock.dm

Co-authored-by: MNarath <47279840+MNarath1@users.noreply.github.com>
2021-06-13 00:37:59 -04:00