cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,586 Commits 55 Branches 0 Tags
d89bc85ae72ea90a690c012ca5201ce4ada3d4ee
Commit Graph

638 Commits

Author SHA1 Message Date
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
qweq12yt
d02b713b46 removes a comment i left behind 2021-02-26 18:45:34 -03:00
qweq12yt
d3ea3ee4f1 fixes pacifist zombo 2021-02-26 18:13:12 -03:00
silicons
60030b6c68 final tweaks 2021-02-13 20:46:40 -07: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
Artur
91cd7378ca Give Improved 2021-01-24 16:05:42 +02: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
silicons
bd3761d39e proper smooth movement 2021-01-08 10:51:48 -08: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
Putnam3145
9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
Artur
f76c3e922c Comments out spacedmm should not sleeps 2020-11-13 15:18:00 +02: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
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
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
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218) 
* fixes

* fix
 2020-08-25 20:58:20 +02: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
de3227e3e0 fix 2020-08-04 22:55:33 -07:00
silicons
0a36f9fbb5 changes 2020-08-04 22:40:28 -07: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
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
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