a1905591f7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-24 23:49:10 -03:00
c07e94be66
push
2024-08-24 21:28:55 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
02e4551a27
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-25 22:52:45 -03:00
24ee6077c7
push changes
2022-10-23 00:18:03 -03:00
7523279254
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-07 22:07:59 -03:00
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
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
d863f9f437
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-06-27 15:54:58 -03:00
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
20509121b8
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13 ; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-03-08 14:07:57 -03:00
a43309a097
shuttle pog
2021-03-05 22:26:55 +08:00
ea4cb2c14d
stop spamming text pls
2021-03-04 10:26:41 +08:00
2be4c76add
THIS FIXES IT (well it should :) )
2021-02-22 21:05:07 +08:00
de67720a0a
icons should exist
2021-02-14 11:39:56 +08:00
f87aa0ac5b
toast. And DiscoFox ™️
2021-02-08 18:46:05 +08:00
f05df1c7de
Huge optimizations+some fixes
2021-01-19 17:48:20 -08:00
273ad286d5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-10-10 14:43:38 -03:00
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
bae8c236f6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
2020-08-09 18:34:33 -03:00
d5a6a3ecd9
actual code chang
2020-07-22 12:02:31 +08:00
05593f84a0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2020-07-16 22:13:13 -03:00
7e533b336d
fix the thing please ( #24 )
2020-07-14 22:24:20 -03:00
b5f77eeb66
Ports a lot of stuff from all around ( #23 )
...
* shhh
* checks the thing
* please don't hurt me, it is my first time
* there, much better
* this is huge
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com >
2020-07-14 01:31:52 -03:00
75493584e5
fix the damn beacon
2020-06-22 19:07:52 -03:00
dabdf16eac
Coonflict fiiixeeess
2020-05-13 12:56:17 +03:00
5b7d9a9008
Merge conflict fix
2020-05-13 12:37:18 +03:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
d1ec18a0ce
what the?!
2020-04-24 00:57:40 +02:00
e0a51903a1
Not yet implemented design security level requirements.
2020-04-24 00:51:04 +02:00
120615d472
Ports https://github.com/tgstation/tgstation/pull/44525 , and
...
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
9d870893fb
Beginning work on DNA console TGUI, plus some camera console fixes
2020-04-23 13:24:43 +03:00
67e0b95407
Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/
2020-04-23 12:36:42 +03:00
80b47ec1c0
Ports https://github.com/tgstation/tgstation/pull/50497
2020-04-23 09:55:28 +03:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
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
bb7bfc04cc
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-05 01:47:04 +01:00
d318525078
Update shuttle.dm
2020-03-03 15:43:10 +01:00
b7dda0080d
Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+)
2020-03-03 15:40:53 +01:00
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
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
SandPoot