8 Commits

Author SHA1 Message Date
nevimer 0a432b7eed Merge remote-tracking branch 'skrat/master' into upstream-christmas
# Conflicts:
#	README.md
#	code/controllers/subsystem/dynamic/dynamic_rulesets_midround.dm
#	code/game/machinery/bank_machine.dm
#	code/modules/unit_tests/station_trait_tests.dm
#	html/changelogs/archive/2023-12.yml
#	modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
#	modular_skyrat/modules/contractor/code/datums/midround/event.dm
#	modular_skyrat/modules/contractor/code/datums/midround/ruleset.dm
#	modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm
#	tgui/packages/tgui/interfaces/Fabrication/SearchBar.tsx
#	tgui/packages/tgui/interfaces/Spellbook.tsx
2023-12-24 23:15:34 -05:00
SkyratBot d718af9913 [MIRROR] Bridge Assistant Station Trait [MDB IGNORE] (#25667)
* Bridge Assistant Station Trait

* Diffs

* fixes

* Update job_traits.dm

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2023-12-24 22:54:11 +00:00
nevimer 0672fd4f8c fixes all CI issues currently (#516)
edit: fixes all CI issues
2023-09-04 15:53:32 -04:00
Cyprex 1728242cf2 fix various CI errors. (#478)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Fixes various biodome linter errors: Duplicated lattices, two tables on
the same tile, lattices on tiles with walls, that sort of stuff.
For Lima this removes a nonexistant typepath
And I made a fix that removes a warning from CI.
2023-08-24 17:17:10 -04:00
nevimer f0b829b7d7 Essential fixes so the game isn't broken. (#432)
~~disables status indicators and fixes a merge conflict that created a
logic error~~
okay it does way more. does fix some CI issues tho. Removes screenshot
tests as we don't have the bot to fix it.
2023-08-10 02:05:45 -04:00
SkyratBot e47459a21b [MIRROR] fixes station trait unit test and gives coroner a cybernetic revolution implant [MDB IGNORE] (#22792)
* fixes station trait unit test and gives coroner a cybernetic revolution implant (#77235)

## About The Pull Request
what the title says, the implant is a bone tongue

## Why It's Good For The Game
bone tongue kinda fits as a unique implant. we should have more implants
though cause we kinda ran outta them

## Changelog
🆑
fix: coroner has an implant during cybernetic revolution
/🆑

* fixes station trait unit test and gives coroner a cybernetic revolution implant

* Gives modular jobs cybernetics

* Update tgstation.dme

* ctrl+s fail

* Merge branch 'upstream-merge-77235' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-merge-77235

* Fine

---------

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-08-01 02:11:29 -04:00
SkyratBot aa8d114bff [MIRROR] Wraps all instances of invoking Fail() into the TEST_FAIL Macro [MDB IGNORE] (#19384)
* Wraps all instances of invoking Fail() into the TEST_FAIL Macro (#73407)

We shouldn't really be invoking the proc itself because then we don't
pass along the failing line/file to our consumers, let's use the macro
in all instances that really need it.

I noticed people were invoking the `Fail()` proc directly rather than
using `TEST_FAIL` instead, so they weren't getting those neat
annotations on their failing code because we never passed along the
failing line/file to actually apply those annotations. That's silly. We
don't even return on `TEST_FAIL` either, so there's no reason to not do
this (only upsides wahoo).

* Wraps all instances of invoking Fail() into the TEST_FAIL Macro

* Correct macro in opfor unit test

---------

Co-authored-by: san7890 <the@san7890.com>
Co-authored-by: Tastyfish <crazychris32@gmail.com>
2023-02-16 19:41:29 -05:00
SkyratBot 7fbcd4901b [MIRROR] New Station Trait: Cybernetic Revolution + Body Purist Quirk [MDB IGNORE] (#17472)
* New Station Trait: Cybernetic Revolution + Body Purist Quirk

* Mirror!

* A hidden lint!

* Properly fixes this, and ensures that it has no impact on the game should it ever be bussed in for whatever reason

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-12-01 17:09:54 -05:00