Commit Graph

343 Commits

Author SHA1 Message Date
keronshb
b33269c806 trailing endline 2021-05-19 19:16:24 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
keronshb
58cb278327 Missing errors and icons 2021-05-19 15:09:56 -04:00
SandPoot
9cf04467a7 upload files 2021-05-05 17:55:30 -03:00
silicons
ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00
Shadow Quill
89fdeb65c5 Adds small walk hud icons 2021-03-23 01:38:45 -05:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Letter N
501d33cddd agony 2021-02-19 10:32:24 +08:00
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
Dan-Neposh
ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
silicons
60030b6c68 final tweaks 2021-02-13 20:46:40 -07:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
silicons
cc981cff7d fix 2021-02-13 20:38:41 -07:00
silicons
5217d0b306 fix 2021-02-13 20:37:09 -07:00
silicons
bcd4ca9e67 fix 2021-02-13 20:34:47 -07:00
silicons
d6a3c2d003 update 2021-02-13 20:30:44 -07:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons
f2853ab414 Merge pull request #14103 from Arturlang/give_hotkey
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
Artur
745c825205 Give hotkey, but citadel 2021-01-20 04:21:57 +02:00
Dan-Neposh
04d5721c4d Merge branch 'master' into clockcultrework_v2 2021-01-14 19:51:15 -05:00
Dan-Neposh
ab5cffc360 Various edits in order to get this PR out finally 2021-01-14 12:56:55 -05:00
Letter N
56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
Letter N
35edf3589b break it real good 2020-12-23 18:58:02 +08:00
Dan-Neposh
05401800f3 splits clockwork guardians from marauders
Also fixes that typo in the guardian spell description
2020-11-16 16:25:15 -05:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
silicons
c3983ee55b Merge pull request #13535 from Hatterhat/energy-sabres
[READY] Energy Sabers - an elegant esword skin for a more civilized age
2020-10-10 22:04:17 -07: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
Hatterhat
9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
Tupinambis
d2500fe389 Adds Methane and Methyl Bromide 2020-09-27 15:15:58 -05:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
silicons
9fef16964c Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-21 03:13:51 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
silicons
d77fb0e17b amends 2020-09-20 13:53:43 -07:00
silicons
86ca2cb905 amends 2020-09-20 13:38:36 -07:00
silicons
8a54395f1a fixes 2020-09-20 04:33:49 -07:00
silicons
3505a5bc18 fixes 2020-09-20 02:10:54 -07:00
silicons
8ebe765d70 fixes 2020-09-20 02:03:18 -07:00
deathride58
1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Ghommie
fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
silicons
e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
silicons
78312c23bf sigh 2020-07-28 21:53:07 -07:00
Lin
a5dd08a054 Merge pull request #12734 from silicons/shoelaces
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
2020-07-28 21:51:43 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00