Commit Graph

74 Commits

Author SHA1 Message Date
LetterN
a057139c33 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-10-30 11:54:20 +08:00
LetterN
49940c373e tgui backend 2021-10-28 12:51:31 +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
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
silicons
8feb473e65 fixes 2021-06-12 04:49:23 -07:00
The0bserver
59d69125f6 Consistency: You can hide it in your boots! 2021-04-21 12:18:01 -04:00
kiwedespars
3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
Hatterhat
263a75ec45 how moment 2020-12-14 16:24:08 -06:00
Hatterhat
04c35f3161 now this is actually based 2020-12-12 20:48:59 -06:00
Ghom
8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
silicons
8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-06-30 20:27:30 -07:00
silicons
837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
Trilbyspaceclone
f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
kevinz000
e9068f05eb let's play the optimization game featuring lighting (#12310)
* debug proc

* kinda quirky

* let's play the lighting game

* let's play the macro game

* let's play the refactor game

* let's play the optimization game

* let's play the optimization game x2

* yeehaw

* e

* let's play the memory game

* fix

* lighting fix

* sanitization and checks

* mh

* hotkeys fix

* ok
2020-05-23 22:47:42 +02:00
Trilbyspaceclone
6dd89ec1e0 Update pockets.dm 2020-04-20 21:50:25 -04:00
kevinz000
a02bad15ea Update stack.dm 2020-04-10 04:45:28 -07:00
kevinz000
6705fc9724 Update rped.dm 2020-04-10 04:45:19 -07:00
kevinz000
857716c473 k 2020-04-09 09:30:28 -07:00
kevinz000
0d0ee1cd46 Merge remote-tracking branch 'citadel/master' into storage_rework 2020-04-06 18:40:58 -07:00
kevinz000
154e145e25 storage 2020-04-06 18:40:20 -07:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000
a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Linzolle
74c308c16c runtime fix 2020-01-01 22:23:16 -06:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
kevinz000
281b254066 Merge pull request #9594 from Hatterhat/patch-3
Shoes can now hold all pistols
2019-10-24 18:56:59 -07:00
Hatterhat
770cd97d70 AYE FUCK IT SHOE PISTOL ANARCHY 2019-10-23 18:48:00 -05:00
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
Hatterhat
2a45cd19fb boot holster boot holster 2019-10-19 20:24:00 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kappa-sama
364d05e2b7 paxton going ape 2019-09-04 20:48:46 -04:00
kappa-sama
599634496e paxton told me to do this or else he'd go ape 2019-09-04 20:46:50 -04:00
kappa-sama
876232c1bc cultist boot cultist boot? 2019-09-04 20:38:51 -04:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
dc20b605fb Fixing some emergency pod storage refactor fuck ups. 2019-06-30 00:40:39 +02:00
Ghommie
d6e54bf237 Fixes and updates pod's emergency suits storage. 2019-06-02 18:28:30 +02:00
Poojawa
657e6316c6 port tg 42691 for component transfer enforcement 2019-05-14 02:49:38 -05:00
Trilbyspaceclone
33e3df8157 What in the hell? 2019-04-25 20:46:39 -04:00
Trilbyspaceclone
a69b845509 Update pockets.dm 2019-04-25 20:41:34 -04:00