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-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,908 Commits 55 Branches 0 Tags
5029af901b173475bb4d5ce480e89f0ca87d3d3b
Commit Graph

865 Commits

Author SHA1 Message Date
zerothebigboy
6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04:00
Hatterhat
4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
DeltaFire
9e3710bb51 kev request 
malf disk gone from the /misc chest type
 2020-09-11 23:19:55 +02:00
timothyteakettle
d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
DeltaFire
f92b68d591 oh. 2020-09-07 21:12:19 +02:00
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
Artur
3fb72e0fea Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-04 11:43:31 +03:00
Ghommie
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Artur
debc300563 https://github.com/tgstation/tgstation/pull/53236/ 2020-09-02 18:39:00 +03:00
Artur
d59748ceaa https://github.com/tgstation/tgstation/pull/53168/ 2020-09-02 18:38:47 +03:00
lolman360
05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
Trilbyspaceclone
da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons
033feebcd0 Merge pull request #12957 from kappa-sama/patch-34 
removes malf disk from tendril loot
 2020-08-29 21:31:24 -07:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
lolman360
f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
silicons
a8ee36fe85 fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209) 
* Update wormhole_jaunter.dm

* Update wormhole_jaunter.dm
 2020-08-23 21:00:07 +02:00
lolman360
bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
lolman360
7ca4fa2f55 compilies/?? 2020-08-15 17:09:12 +10:00
lolman360
0bc79b82eb ABDCE 2020-08-14 20:18:55 +10:00
Hatterhat
d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Hatterhat
e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Hatterhat
9a862b10e1 the perfect parry update 2020-08-08 10:47:43 -05:00
Hatterhat
fd8f3781cc test commit please ignore 2020-08-07 17:03:38 -05:00
Hatterhat
c227fc7546 wait, shit 2020-08-07 16:56:53 -05:00
TrilbySpaceClone
3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Lin
c310b1a70e Merge pull request #12997 from silicons/lavastaff 
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
 2020-08-05 19:43:38 -05:00
silicons
4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive 
Proto-Kinetic Glaives - a crusher reskin
 2020-08-05 15:25:48 -07:00
Hatterhat
4df9efb076 heho attack text 2020-08-04 00:29:30 -05:00
Trilbyspaceclone
dc4d83d2db Update necropolis_chests.dm 2020-08-03 11:06:00 -04:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Trilbyspaceclone
0ec756cce6 the all crate 2020-08-03 10:43:58 -04:00
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Hatterhat
ccee254546 proof of concept: crusherglaive - squashed 2020-08-02 12:30:14 -05:00
silicons
8b2163792a Update necropolis_chests.dm 2020-08-01 21:05:23 -07:00
silicons
20dea7e41f fix 2020-08-01 20:45:49 -07:00
kappa-sama
94ee8bec08 ok 2020-08-01 19:19:59 -04:00
kappa-sama
adf4a8a2e3 indent 2020-07-31 17:10:06 -04:00