 Enric Gabriel
|
d286153128
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-04 19:08:14 -03: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 |
|
|
Enric Gabriel
|
f759503b49
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-22 20:30:49 -03:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Enric Gabriel
|
bae8c236f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-09 18:34:33 -03:00 |
|
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
|
Enric Gabriel
|
372b486daf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-01 10:07:19 -03:00 |
|
|
Enric Gabriel
|
935901593b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-29 09:52:32 -03: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 |
|
|
LinandGitHub
|
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 |
|
|
Enric Gabriel
|
e383e4cad8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-24 00:11:22 -03: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 |
|
|
Enric Gabriel
|
05593f84a0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-16 22:13:13 -03:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Enric Gabriel
|
1207761468
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-07-02 13:56:39 -03:00 |
|
|
Ghommie
|
a34a7ba5d4
|
You can't (un)equip garments on/from obscured inventory slots anymore.
|
2020-06-28 01:10:22 +02:00 |
|
|
Artur
|
c41d2e78be
|
Conflicts!!!
|
2020-06-22 17:39:24 +03:00 |
|
|
Enric Gabriel
|
cb261a1b74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-06-17 20:23:21 -03:00 |
|
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
|
Artur
|
19f215477e
|
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
|
2020-05-30 18:52:02 +03:00 |
|
|
Enric Gabriel
|
bea359ae01
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2020-05-27 22:21:19 -03:00 |
|
|
GhomandGitHub
|
968426fd48
|
Combat mode component. (#12338)
* Combat mode component.
* Whoops.
* test.
* Oh
* refs begone, and documentation.
|
2020-05-27 18:00:32 -07:00 |
|
|
RohesieandGitHub
|
d88c815845
|
vars (#12373)
|
2020-05-28 01:18:26 +02: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 |
|