83 Commits

Author SHA1 Message Date
SandPoot c07e94be66 push 2024-08-24 21:28:55 -03:00
LetterN 18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
LetterN fa6946fae4 added the funny. Also adds balloon_alert to more stuff (primarily atmos) 2021-11-16 16:10:12 +08:00
Putnam3145 60e61ecbb0 Fire overhaul 2021-11-13 22:43:54 -08:00
Letter N bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
Putnam bcbcd6bfce aoaoaoao 2021-06-11 18:16:47 -07:00
Putnam 3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Putnam 268d3ec408 Fixed the funny UI stuff 2021-06-08 18:22:15 -07:00
Putnam 80e8c8af4a WHOOPS I SWAPPED FILTERS 2021-06-08 02:40:32 -07:00
Putnam d03bf641dd extreme optimization project to maybe fix game 2021-06-06 21:58:24 -07:00
Letter N 92eb4fb684 filter 2021-02-12 12:40:24 +08:00
Letter N 5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Putnam e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Artur 80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Artur e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Artur ff8289c177 Fixes 2020-01-24 18:48:50 +01:00
r4d6 2b3f00ed1e Fix Freezer overlay bug 2020-01-18 22:16:43 -05:00
r4d6 5084146400 Port 2020-01-18 18:46:22 -05:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Putnam 1b310d41bf Filters are now volume-based. 2019-11-29 21:23:08 -08:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Arturlang 44be4ea7b4 Reviewers suggestions 2019-06-12 23:58:54 +03:00
unknown 355e384ba1 Spacing fixes 2019-06-11 14:31:27 +03:00
unknown 9219401154 Doneso 2019-06-11 14:24:16 +03:00
deathride58 aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Arturlang 3f7f8a3560 Update mixer.dm
Adds logging and to-admin
2019-05-26 17:34:48 +03:00
Arturlang 3eff474300 Update filter.dm
Adds logging and to-admin
2019-05-26 17:33:25 +03:00
Arturlang 9e025a03bd Ditto
Adds output max confirmation, removes unneeded icon update
2019-05-24 15:23:54 +03:00
Arturlang 7b82ce463b Ditto
Removes icon update, adds text confirmation to maxed pump in filter
2019-05-24 15:23:10 +03:00
Arturlang fc54f4b7bf Update mixer.dm 2019-05-24 13:49:24 +03:00
Arturlang 07db00be8f Update filter.dm 2019-05-24 13:48:03 +03:00
Arturlang ea1edd965d Update mixer.dm 2019-05-24 12:18:13 +03:00
Arturlang 277a498f28 Update filter.dm 2019-05-24 12:13:45 +03:00
deathride58 905f32b193 further optimizes performance by making all of the meta gas properties use their own individual lists instead of being in a messy nested list 2019-04-14 16:40:37 -04:00
deathride58 41375d9737 Increases performance significantly by turning garbage collection into a define 2019-04-14 11:33:28 -04:00
deathride58 2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58 8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
deathride58 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
81Denton 8fdc520031 Adds multilayer pipe subtypes for mapping (#37341)
* adds multilayer pipe subtypes for mapping

* replaces values with defines
2018-04-23 10:33:20 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
Jordan Brown d47686c88e Removes empty New() 2018-03-31 09:11:04 -05:00
deathride58 0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay dae3c3efb5 Merge branch 'master' into upstream-merge-33621 2017-12-30 13:23:39 -06:00