Mosley
0d9eebd20c
Merge remote-tracking branch 'upstream/master'
2025-04-24 17:03:15 -05:00
SandPoot
56d972eb0b
all sorts of fixes and updates, may break stuff
2025-02-09 02:09:28 -03:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -05: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
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
BongaTheProto
e5d3783aa9
fixes and modularizes
...
it works woohooo
2023-10-03 02:04:17 -05:00
57a40ac3d9
Порт Scaled Appearance с Vore Station ( #140 )
...
* monophobia blind fix (#63 )
* Первый камень
* Тут явно достаточно лишнего, особенно в префах, что можно было бы удалить
---------
Co-authored-by: FelixRuin <31424899+FelixRuin@users.noreply.github.com >
2023-10-03 01:09:53 -05:00
BongaTheProto
ea324c5bc1
Merge remote-tracking branch 'upstream/master'
2023-07-28 20:43:43 -05:00
SandPoot
11aa13e4e8
part 1 - 41928
2023-07-26 21:45:43 -03:00
BongaTheProto
79779da186
Fix + cl
2022-02-12 18:56:32 -05:00
Letter N and GitHub
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
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
SandPoot and GitHub
b3c2f52358
Update transform_procs.dm
2021-02-27 15:57:04 -03:00
SandPoot
0952777c56
upload transform_procs.dm
2021-02-27 15:53:17 -03:00
MrJWhit
a78b6ae958
Update transform_procs.dm
2021-01-22 19:35:17 -05:00
Artur
503d0156c6
Does the thing
2020-11-08 23:24:58 +02:00
silicons and GitHub
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Timothy Teakettle
a8a495c0ac
rewrites pickle handling
2020-07-16 18:22:58 +01:00
Artur
9e73788714
Gah
2020-07-16 17:40:05 +03:00
Arturlang and GitHub
92ed5d3201
Merge branch 'master' into TGUI-3.0
2020-07-16 15:59:37 +03:00
timothyteakettle
03bd806c73
pickle
2020-07-16 02:51:07 +01:00
Artur
a02e6ab03e
Compile
2020-06-22 21:30:54 +03:00
Artur
c41d2e78be
Conflicts!!!
2020-06-22 17:39:24 +03:00
kevinz000
445d94f335
haha whew
2020-06-17 21:32:10 -07: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
kevinz000 and GitHub
395d434e6e
Merge pull request #12200 from Ghommie/Ghommie-cit738
...
nutrition adjustment wrapper procs from tg.
2020-05-12 12:28:02 -07:00
Ghommie
667c12d413
nutrition adjustment wrapper procs.
2020-05-10 21:41:50 +02:00
Ghommie
2858ddd90b
Porting "Refactors language holder"
2020-05-08 22:44:02 +02:00
Artur
321902c35a
Ports https://github.com/tgstation/tgstation/pull/50225
2020-04-23 13:28:09 +03:00
Seris02
cccd0e9eef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-03-09 16:49:32 +08:00
Seris02
ee7064840d
merge conflicts fixed finally
2020-02-05 18:42:16 +08:00
kevinz000
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
kevinz000 and GitHub
275b1f73e0
Merge pull request #10849 from Ghommie/Ghommie-cit547
...
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
Ghommie
8de11845d5
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-02 03:39:49 +01:00
Ghommie
188f726ffd
unicode support port wip
2020-01-31 05:32:00 +01:00
kevinz000
7bcb37c5d1
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-01-16 21:12:56 -07:00
kevinz000
1acac87da3
compile
2020-01-15 23:54:30 -07:00
Seris02
16b5c83a3a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
2020-01-13 12:53:52 +08:00
AffectedArc07
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
kevinz000
830054c106
sigh
2020-01-10 13:25:47 -08:00
kevinz000
e4cfb1fa39
more
2020-01-07 12:03:46 -08:00
kevinz000
2a304800df
more reformatting
2020-01-07 11:46:32 -08:00
Seris02
862acf2f06
ports hyper's genetics
2019-12-28 21:33:15 +08:00
Ghommie
2ac24b2ac6
Fixing head rev blebs
2019-10-09 18:18:49 +02:00
Ghommie
735755019e
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-10-09 01:18:30 +02:00
Fermiand Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00