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 |
|
SandPoot
|
273ad286d5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-10 14:43:38 -03: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 |
|
Enric Gabriel
|
7df07d2859
|
Merge branch 'master' of upstream into master
|
2020-10-01 12:49:01 -03:00 |
|
Tupinambis
|
d2500fe389
|
Adds Methane and Methyl Bromide
|
2020-09-27 15:15:58 -05:00 |
|
SandPoot
|
13834c4bef
|
Morrowinventory Port (#75)
|
2020-09-24 20:14:53 -03:00 |
|
silicons
|
7249fe058f
|
config based
|
2020-09-21 17:36:30 -07:00 |
|
Enric Gabriel
|
4de9baf690
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-21 14:10:28 -03: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
|
102a452067
|
fixes
|
2020-09-20 02:14:41 -07:00 |
|
silicons
|
3505a5bc18
|
fixes
|
2020-09-20 02:10:54 -07:00 |
|
silicons
|
8ebe765d70
|
fixes
|
2020-09-20 02:03:18 -07:00 |
|
silicons
|
1ea0dd9f76
|
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
|
2020-09-19 15:56:13 -07:00 |
|
Artur
|
1c831692a7
|
Properly fixed altclick
|
2020-09-16 00:41:47 +03:00 |
|
Artur
|
b2fb23f4b9
|
Alt click fix
|
2020-09-08 17:56:05 +03:00 |
|
Artur
|
589bedcfaf
|
Fixes alt click, themes a little, and re enter corpse
|
2020-09-07 13:06:34 +03:00 |
|
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 |
|
Artur
|
3bef4ba35e
|
TGUI updates + statpanel
|
2020-09-02 17:52:47 +03:00 |
|
Enric Gabriel
|
45c5d5d81d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-25 16:06:57 -03:00 |
|
silicons
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02: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 |
|
silicons
|
de3227e3e0
|
fix
|
2020-08-04 22:55:33 -07:00 |
|
silicons
|
0a36f9fbb5
|
changes
|
2020-08-04 22:40:28 -07:00 |
|
Enric Gabriel
|
8558cc8747
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-04 01:48:59 -03:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Timothy Teakettle
|
03d01d917f
|
Merge branch 'master' into wounds-part-2
|
2020-08-02 18:10:31 +01: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 |
|
silicons
|
2230a3665a
|
Merge pull request #12965 from timothyteakettle/end-our-suffering
drastically lowers the damage-related benefits of combat mode
|
2020-08-01 03:33:43 -07:00 |
|
silicons
|
320c91f4d3
|
Merge pull request #12742 from KeRSedChaplain/clockcultrework
Clockwork Cult rework
|
2020-08-01 00:17:11 -07:00 |
|
Enric Gabriel
|
3bf338087d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-07-31 17:11:36 -03:00 |
|
silicons
|
ad75ac0c6d
|
Update telekinesis.dm
|
2020-07-31 02:30:56 -07:00 |
|
timothyteakettle
|
caaedce6e2
|
end our suffering
|
2020-07-30 02:33:39 +01:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01: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 |
|
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
|
5bf4afcade
|
sigh
|
2020-07-27 14:09:37 -07:00 |
|
silicons
|
dc278d7b02
|
woops
|
2020-07-27 13:11:26 -07:00 |
|
silicons
|
67b518bf42
|
experimental
|
2020-07-27 13:09:54 -07:00 |
|