Commit Graph
179 Commits
Author SHA1 Message Date
SandPoot 3b5e2e5091 stop being annoying 2023-08-26 20:47:16 -03:00
SandPoot 25deceb75f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-19 23:02:20 -03:00
siliconsandGitHub 9ded655c71 Update ui.dm (#15683) 2022-06-14 06:04:01 +02:00
SandPoot be1357bdb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:29:38 -03:00
deathride58 1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPootandGitHub 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00
SandPoot e8c8d2b0ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-25 11:38:07 -03:00
LetterN fab4b07be5 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-12-21 07:59:33 +08:00
SandPootandGitHub 7b34851794 Adds functionality to dressers once again (#209) 2021-12-11 16:52:48 -03:00
SandPoot ed053988d8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-24 22:11:23 -03:00
SandPoot f1f6ac0109 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-31 22:14:23 -03:00
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 NandGitHub bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot 32a6e63698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-27 23:11:54 -03:00
Artur bfcdf83e55 buildmode mapgen tool save 2021-10-26 16:31:36 +03:00
SandPoot bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
SandPoot e738c3cf21 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-27 12:40:48 -03:00
keronshb 7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot 6102fd505e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-15 01:09:40 -03:00
silicons 8feb473e65 fixes 2021-06-12 04:49:23 -07:00
silicons 55e8d67521 refactor a bit 2021-06-12 04:41:58 -07:00
silicons 85b1125c83 fix 2021-06-12 04:36:02 -07:00
SandPoot 0313149d1c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-08 02:43:01 -03:00
The0bserver 59d69125f6 Consistency: You can hide it in your boots! 2021-04-21 12:18:01 -04:00
SandPoot 5002a33209 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-13 22:54:07 -03:00
siliconsandGitHub ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00
SandPoot a8076257a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-18 22:56:09 -03: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
SandPoot 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
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot 1bdabd4e82 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-17 17:35:20 -03: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
SandPoot 60e78f4ac7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-26 12:27:08 -03:00
Artur 16e0b85b44 More funshit 2021-01-20 18:23:28 +02:00
SandPoot 66ebcce860 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-19 01:07:54 -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
Enric Gabriel 37a3baed9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-01 18:30:26 -03:00
GhomandGitHub 8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
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
siliconsandGitHub 837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
Enric Gabriel c5f4caffcc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-02 22:20:48 -03:00
TrilbyspacecloneandGitHub f926dd7f5e Update pockets.dm (#12421) 2020-06-02 15:29:51 -07:00
Enric Gabriel 4d962b8fb1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-05-25 18:06:40 -03:00