Commit Graph

316 Commits

Author SHA1 Message Date
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
silicons
e3b8c212f1 ok 2020-07-25 23:14:38 -07:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
silicons
d30acd5b09 smooth 2020-07-23 13:49:17 -07:00
silicons
c3ca4be149 ok 2020-07-23 13:47:07 -07:00
silicons
95cd7c6571 fix 2020-07-23 11:46:46 -07:00
silicons
89a1fa544e fixes 2020-07-23 10:12:34 -07:00
Keate Senior
fafde35ee2 Fixes the Arks looping issue, and gives Ratvar new words when fighting
Also removes the grace period variable since the ark activates immediately now /shrug
2020-07-23 12:59:40 -04:00
silicons
21d57eeeac sigh 2020-07-23 00:27:45 -07:00
silicons
3a38344a04 fix 2020-07-23 00:25:06 -07:00
silicons
910290edcf buffers 2020-07-23 00:22:33 -07:00
silicons
76f885e1a6 ok 2020-07-23 00:16:43 -07:00
silicons
184e3992f3 fixes 2020-07-21 11:56:23 -07:00
silicons
4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons
f3efa19436 Merge remote-tracking branch 'citadel/master' into 12742 2020-07-21 11:25:26 -07:00
silicons
1450b11b01 sigh 2020-07-20 21:37:44 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
Keate Senior
21af6d4805 same as last commit but I actually stage all the right files 2020-07-20 03:20:13 -04:00
silicons
ae83a6df02 fix 2020-07-19 19:51:17 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
silicons
0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
silicons
de8ac9896a sigh 2020-07-11 07:13:56 -07:00
silicons
cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons
8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00