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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,430 Commits 55 Branches 0 Tags
ed6780159053450cbc1b51c82cf1ba8f8bc51da4
Commit Graph

3073 Commits

Author SHA1 Message Date
Letter N
454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Lin
2885b861f2 Merge pull request #12954 from silicons/killer_queen 
bomb stands now use components
 2020-08-02 12:52:07 -05:00
silicons
06f5ce6401 buffs shoving (#12925) 
* ^w^

* ok

* ok
 2020-08-02 18:30:09 +02:00
silicons
25d1fb761a Merge remote-tracking branch 'citadel/master' into killer_queen 2020-08-01 20:51:38 -07:00
silicons
e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits 
Durathread Reinforcement Kits
 2020-08-01 03:35:45 -07: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
30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa 
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
 2020-08-01 02:24:01 -07:00
timothyteakettle
e17e1c3a11 conforms to same as everything else 2020-07-31 22:45:03 +01:00
Hatterhat
6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Letter N
e40470f553 h. Updates NTOS, and axes p2p filetransfer! 2020-07-30 20:54:13 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
timothyteakettle
caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
Sishen
7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06: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
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
silicons
93da2515b6 Merge pull request #12948 from Hatterhat/windows 
[speedmerge? it's not that bad i swear] directional window rotation fix
 2020-07-28 13:27:12 -07:00
silicons
c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons
78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons
fd738fd16a spelling 2020-07-28 12:12:30 -07:00
silicons
c720e800df whew! 2020-07-28 12:08:02 -07:00
silicons
6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
Hatterhat
8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen
27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
Ghommie
f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
SiliconMain
8f1a8adcfd Update negative.dm 2020-07-26 04:15:39 -05:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
91081ef24c Merge pull request #12872 from Iatots/hairball 
Adds depth to the lick wounds mechanic.
 2020-07-25 15:40:15 -07:00
silicons
0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
Letter N
8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
Iatots
f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +02:00
silicons
1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
silicons
d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats 
adds deep beepsky lore to the game in the form of hats
 2020-07-23 16:18:17 -07:00
silicons
03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
Iatots
554e764be8 Update cuts.dm 
dang speededit
 2020-07-23 21:00:26 +02:00
Iatots
a2381755e1 Update cuts.dm 
nomenclature error
 2020-07-23 20:52:29 +02:00
Iatots
e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Lin
cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46 
regarding manifest injections
 2020-07-23 13:18:35 -05:00
Iatots
9d89158fda Update cuts.dm 2020-07-23 19:48:41 +02:00
Timothy Teakettle
b18356c95d requested changes 2020-07-23 18:47:34 +01:00
Iatots
3dac7e4b43 Update generic_positive_events.dm 2020-07-23 19:44:02 +02:00
silicons
da4e208f94 ok 2020-07-23 10:40:12 -07:00
silicons
db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
silicons
ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly 
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
 2020-07-23 10:28:44 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons
3a38344a04 fix 2020-07-23 00:25:06 -07:00
silicons
66e4d98141 Update datacore.dm 2020-07-22 16:59:51 -07:00