Commit Graph

87520 Commits

Author SHA1 Message Date
SkyratBot
84d0c39b6b [MIRROR] Add preference to disable deadmin preferences in CentCom [MDB IGNORE] (#8515)
* Add preference to disable deadmin preferences in CentCom (#61751)

* Add preference to disable deadmin preferences in CentCom

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-10-01 03:03:48 +01:00
SkyratBot
dc57d5edd9 [MIRROR] Vending machines now use their name as a title for their UI [MDB IGNORE] (#8514)
* tgui: Vending machine titles (#61780)

* Vending machines now use their name as a title for their UI

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-10-01 03:03:34 +01:00
SkyratBot
71162dda6e Automatic changelog generation for PR #8513 [ci skip] 2021-10-01 04:03:26 +02:00
SkyratBot
e48c9cddde [MIRROR] Fix the species list not scrolling, fix halloween species runtimes [MDB IGNORE] (#8513)
* Fix the species list not scrolling, fix halloween species runtimes (#61764)

* Fix the species list not scrolling, fix halloween species runtimes

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-10-01 03:03:24 +01:00
SkyratBot
08a7c5a6a9 [MIRROR] Fixes the icon state of the theater area tile [MDB IGNORE] (#8511)
* Working Version of the theater fix (#61777)

* Fixes the icon state of the theater area tile

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
2021-10-01 01:24:19 +01:00
Gandalf
7050267903 Update BlueShift.dmm 2021-10-01 01:03:30 +01:00
SkyratBot
743db6c8cc Automatic changelog generation for PR #8510 [ci skip] 2021-10-01 01:57:04 +02:00
AxieTheAxolotl
d47ba48e52 [FUCK] quick fix for blueshift (#8510)
* wack ass

* Revert "wack ass"

This reverts commit a02089265919e2038533817a4a9b743c87fe2536.

* wack ass
2021-10-01 00:57:00 +01:00
SkyratBot
954ea09bc7 Automatic changelog generation for PR #8509 [ci skip] 2021-10-01 01:54:13 +02:00
Gandalf
0b8421f298 Collars the singularity (#8509)
* Collars the singularity

* Update singularity.dm

* Update singularity.dm
2021-09-30 19:54:11 -04:00
SkyratBot
8b7c040a18 Automatic changelog generation for PR #8463 [ci skip] 2021-10-01 01:21:39 +02:00
SkyratBot
13fe213621 [MIRROR] [MDB Ignore] Make shuttle windows deconstructable [MDB IGNORE] (#8463)
* [MDB Ignore] Make shuttle windows deconstructable

* E

* re

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:21:36 +01:00
Seris02
a4371bd951 yee (#8501) 2021-10-01 00:14:28 +01:00
SkyratBot
c6a90dea4c Automatic changelog generation for PR #8500 [ci skip] 2021-10-01 01:14:19 +02:00
sheetofseaweed
5beee6e8f9 fishnet_fix (#8500)
Co-authored-by: HolyTape <idennisendr@gmail.com>
2021-10-01 00:14:17 +01:00
Seris02
e8d97c3d47 [nonmodular] makes the prefs tricolor select into color select buttons instead of text boxes (#8499)
* weh

* woops

* yee again
2021-10-01 00:13:57 +01:00
death and coding
d761232fe3 [modular][ready]adds a kilt for the captain (#8498)
* [modular][ready]adds a kilt for the captain

* oops

* let there be bright

Co-authored-by: louiseedwardstuart <bonniefluff>
2021-10-01 00:13:51 +01:00
SkyratBot
e250fcd9de Automatic changelog generation for PR #8495 [ci skip] 2021-10-01 01:13:42 +02:00
Seris02
ed8ee9a31f sigh (#8495) 2021-10-01 00:13:40 +01:00
SkyratBot
ad7c665625 Automatic changelog generation for PR #8480 [ci skip] 2021-10-01 01:12:20 +02:00
SkyratBot
ed1398425c [MIRROR] spaces -> tabs in vendor code [MDB IGNORE] (#8480)
* spaces -> tabs in vendor code

* Update engivend.dm

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:12:18 +01:00
SkyratBot
2198024a73 [MIRROR] You can now use backslashes as an escape character for text modification. [MDB IGNORE] (#8438)
* You can now use backslashes as an escape character for text modification.

* Update ticker.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:11:14 +01:00
SkyratBot
5d701bcbc7 Automatic changelog generation for PR #8453 [ci skip] 2021-10-01 01:10:29 +02:00
SkyratBot
7b3baea1b9 [MIRROR] Ports animated locker doors [MDB IGNORE] (#8453)
* Ports animated locker doors

* 0

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:10:26 +01:00
SkyratBot
4670b12195 Automatic changelog generation for PR #8479 [ci skip] 2021-10-01 01:08:41 +02:00
SkyratBot
6a3a1aed83 Rendering refactor P1: Plane unification and render relaying (pictures and video included) (#8479)
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-01 00:08:39 +01:00
SkyratBot
2462ff8d4a Automatic changelog generation for PR #8124 [ci skip] 2021-10-01 00:21:21 +02:00
AxieTheAxolotl
82e7ea29a4 [SEMI-MODULAR] [READY] Blueshift (#8124)
* Blueshif

* Update BlueShift.dmm

* Nerfs Maint Loot

* Update BlueShift.dmm

* Fixed Dice Bags

* Quote: "a bunch of bugfixes"

* Update BlueShift.dmm

* Fixes

* I am honestly unsure of what this changed.

* temp override

* Revert "temp override"

This reverts commit ece2498def33b6eb612e7bf596ee92f9037e07ee.

* I hate my life

* Update BlueShift.dmm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-30 23:21:19 +01:00
SkyratBot
e2a751ffc2 Automatic changelog generation for PR #8507 [ci skip] 2021-10-01 00:19:13 +02:00
jjpark-kb
c99679bbda fix pipe and wire at delta arrivals (#8507) 2021-09-30 23:19:11 +01:00
SkyratBot
1a0102d8f1 Automatic changelog generation for PR #8505 [ci skip] 2021-10-01 00:18:59 +02:00
jjpark-kb
e1f6f4a334 fix speed upgrade still being in the techweb (#8505) 2021-09-30 23:18:57 +01:00
SkyratBot
96dcc6fb9d Automatic changelog generation for PR #8504 [ci skip] 2021-10-01 00:04:09 +02:00
SkyratBot
a744314c83 [MIRROR] Refactors how circuit size is calculated. Fixed module circuit size not taking up capacity equal to the amount of circuit components inside of it. [MDB IGNORE] (#8504)
* Refactors how circuit size is calculated. Fixed module circuit size not taking up capacity equal to the amount of circuit components inside of it. (#61554)

Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>

* Refactors how circuit size is calculated. Fixed module circuit size not taking up capacity equal to the amount of circuit components inside of it.

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Watermelon914 <3052169-Watermelon914@ users.noreply.gitlab.com>
2021-09-30 23:04:07 +01:00
SkyratBot
f003956489 [MIRROR] Slight improvement to voice of god logging [MDB IGNORE] (#8502)
* Slight improvement to voice of god logging (#61757)

Logs the Voice of God if forced by something, which currently is only Godwoken syndrome brain trauma.

* Slight improvement to voice of god logging

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-09-30 23:03:59 +01:00
SkyratBot
cf6ee27302 Automatic changelog generation for PR #8496 [ci skip] 2021-10-01 00:03:48 +02:00
SkyratBot
cea0ced0b0 [MIRROR] Fixes the Spawners Menu not letting you jump or spawn in as ghost roles. [MDB IGNORE] (#8496)
* Fixes the Spawners Menu not letting you jump or spawn in as ghost roles. (#61770)

* Feex

* Better feex

* Fixes the Spawners Menu not letting you jump or spawn in as ghost roles.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-09-30 23:03:45 +01:00
SkyratBot
7abc7194cc Automatic changelog generation for PR #8494 [ci skip] 2021-10-01 00:02:20 +02:00
SkyratBot
81adc00b30 [MIRROR] AI lawset can't be asimov on unique-lawset station trait shifts [MDB IGNORE] (#8494)
* AI lawset can't be asimov on unique-lawset station trait shifts (#61729)

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

* AI lawset can't be asimov on unique-lawset station trait shifts

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-09-30 23:02:18 +01:00
SkyratBot
f295464c2a [MIRROR] Corrects mapload args that sprug up in the past few days [MDB IGNORE] (#8462)
* Corrects mapload args that sprug up in the past few days (#61759)

See #61623 . These were either merged after the prior PR, coded before the prior PR, or were made in between and not updated.

* Corrects mapload args that sprug up in the past few days

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-09-30 23:01:27 +01:00
SkyratBot
efd2bd1c95 Automatic changelog generation for PR #8461 [ci skip] 2021-09-30 20:17:30 +02:00
twilightwanderer
66d624027d Restoring the skyrat version of the Borg tools. (#8461)
* Recovering skyrat tools from robot_modules.dm

* Creating a separate module for Borg tools.

* Restoring the original tgstation code

* Add trailing newline

* Include skyrat borg modules on tgstation.dme

* Editing an error on robot_model.dm

* Editing an error on robot_model.dm

* Replacing tgsttion modules with skyrat modules

* Removing inheritance from /obj/item/robot_model

Co-authored-by: twilightwanderer <twilightwanderer@users.noreply.github.com>
2021-09-30 19:17:27 +01:00
SkyratBot
2fa94b8277 Automatic changelog generation for PR #8491 [ci skip] 2021-09-30 20:14:29 +02:00
SkyratBot
ad55e8798f [MIRROR] Resprites Iron Chairs [MDB IGNORE] (#8491)
* adds chair sprites (#61763)

imageadd: Resprites iron and material chairs into new ones, originally from Yogstation!

* Resprites Iron Chairs

Co-authored-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
2021-09-30 19:14:27 +01:00
SkyratBot
8023795a41 Automatic changelog generation for PR #8482 [ci skip] 2021-09-30 18:38:11 +02:00
cheapcents
763bc8773f New brig for Icebox :) (#8482)
* New brig for Icebox :)

* Fixes many many bugs

Undoes rollbacked changes to Icebox.
Fixes multiple APCs.
Wires on exterior reinforced windows.
Fixes all lights in sec.
Fixes all cameras in sec.
Removes basketball court as it blocks access to the library.
Fixes curtain buttons and their access, so only security can open them from the outside.
Changes TV into arcade machine.
Adds condimaster.
Adds breath masks.
Puts showers on the walls.
Moves techfab to office.
Returns office tables into something conference-style.
Fixes disposals from being broken.
Fixes mail sorting from being broken.
Fixes escape pods with incorrect area.
Fixes escape pod door having an rwall in it.

* Additional security

The brig has exterior windows electrified, same for the prison.
The courtroom, as it is an escape route for prisoners, has windows electrified.
Reinforces all exterior walls outside prison maint. Escape is now a little more difficult.
Maint doors outside the prison start bolted, and some planked up.
Adds a bit more loot in the maint outside the prison.
Re-adds xenoarch content in a much more subtle manner.
Adds disposals for the mining base, since I assume xenoarch needs a trash sy stem.

* Fixes more issues

Adds exit to space in courtroom.
Fixes missing fire alarms.
Fixes duplicate doors/lights.
Adds a fryer to prison kitchen.
Makes showers a little smaller so a curtain can be added.
Removes firelocks on maint doors.
Fixes turnstile IDs.

* mapmerge is hanging up

it's erroring on an issue that's been fixed.

* Create IcemoonUnderground_Above_skyrat.dmm

* one roundstart atmos difference yeeted

Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-09-30 17:38:09 +01:00
SkyratBot
25e14eb7ef Automatic changelog generation for PR #8421 [ci skip] 2021-09-30 04:55:54 +02:00
ForrestWick
85a5ed4de3 [MODULAR] [READY][FIXES] Cargodise Lost fixes (#8421)
* cargodise fixes and ship

* Update shuttles.dm

* Update ghost_role_spawners.dm

* should be fixed?

* finished
2021-09-30 03:55:52 +01:00
SkyratBot
159ee9360a Automatic changelog generation for PR #8493 [ci skip] 2021-09-30 03:27:08 +02:00
jjpark-kb
8e04fb84b6 fix clay creation in sinks (#8493) 2021-09-29 21:27:06 -04:00