Commit Graph

114 Commits

Author SHA1 Message Date
Alphas00
70de1c7076 Roundend and Shuttle Recall fixes
Fixed roundend error due to fatness permanence saving
Fixed vote shuttle not being recallable by admins
2024-12-08 19:33:37 +01:00
evilew
10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew
edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot
c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot
a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
SandPoot
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot
24ee6077c7 push changes 2022-10-23 00:18:03 -03:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460)
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
2022-02-07 15:17:24 -08:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
Putnam
cc360288bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-03-08 14:46:46 -08:00
Letter N
a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N
ea4cb2c14d stop spamming text pls 2021-03-04 10:26:41 +08:00
Letter N
2be4c76add THIS FIXES IT (well it should :) ) 2021-02-22 21:05:07 +08:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
Putnam
f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
Letter N
d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
Ghommie
d1ec18a0ce what the?! 2020-04-24 00:57:40 +02:00
Ghommie
e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur
9d870893fb Beginning work on DNA console TGUI, plus some camera console fixes 2020-04-23 13:24:43 +03:00
Artur
67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kevinz000
5ebf8ef1e3 Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
2020-03-06 00:19:26 -07:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghom
d318525078 Update shuttle.dm 2020-03-03 15:43:10 +01:00
Ghom
b7dda0080d Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+) 2020-03-03 15:40:53 +01:00
Hatterhat
19ae30ea5b alright ghom i hope this works
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-23 21:20:57 -06:00
Hatterhat
b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Hatterhat
6dbd58b5df i really fucked this up please advise 2020-02-21 16:07:41 -06:00
Hatterhat
07222cfd9a *snap 2020-02-20 22:21:25 -06:00
Ghom
84f91cf665 Update shuttle.dm 2020-02-05 21:33:37 +01:00
Ghom
e14d2caacc Update shuttle.dm 2020-02-05 21:20:49 +01:00
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
kevinz000
b5b00102a0 Update shuttle.dm 2020-01-01 22:04:34 -08:00
kevinz000
09e5cd95a3 Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
2019-11-14 15:50:20 -07:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
2019-11-08 14:17:17 +13:00
Ghommie
100a87d57b Unmodularize configuration, _globalvars and subsystems. 2019-11-02 20:42:01 +01:00
kevinz000
78174fcc06 Update shuttle.dm 2019-10-27 16:16:02 -07:00
kevinz000
5f75664350 Update shuttle.dm 2019-10-25 09:35:59 -07:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
kevinz000
64a026ca11 Update shuttle.dm 2019-04-20 16:26:48 -07:00