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
35,878 Commits 55 Branches 0 Tags
3ca098fe98009fb476272c8db003ffc9c02eb3a8
Commit Graph

1010 Commits

Author SHA1 Message Date
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle
8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Lin
1f7488aad2 Merge pull request #12821 from Citadel-Station-13/silicons-patch-36 
Increases projectile speed across the board by around 40-45%
 2020-07-23 13:41:17 -05:00
silicons
20381927e4 Update projectile.dm 2020-07-18 19:18:42 -07:00
Timothy Teakettle
1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
timothyteakettle
7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghom
17ee8c5960 Merge pull request #12660 from YakumoChen/master 
Reverts improv small arms, makes guncrafting easier and faster
 2020-07-04 18:35:22 +02:00
silicons
c10350f10e Merge pull request #12677 from Ghommie/Ghommie-cit830 
Fixes items' skills list keys missing associated traits and improves modulability a little.
 2020-07-04 00:12:37 -07:00
kappa-sama
05591ee04c better 2020-07-03 05:40:18 -04:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
kappa-sama
cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c yeah ok 2020-07-01 07:40:43 -04:00
YakumoChen
67b5efbce0 Update pistol.dm 2020-07-01 09:03:48 +00:00
kappa-sama
e03112d1dc these 2020-07-01 04:59:59 -04:00
YakumoChen
346007b4fb Update beams.dm 2020-07-01 08:58:27 +00:00
YakumoChen
a3961a642c removes improv laser 2020-07-01 08:57:48 +00:00
YakumoChen
baf41d828a removes improv laser 2020-07-01 08:57:35 +00:00
YakumoChen
550aa405e5 Update pistol.dm 2020-07-01 08:56:43 +00:00
YakumoChen
d9e5847b8f Update pistol.dm 2020-07-01 08:56:13 +00:00
YakumoChen
6a48b9199f Update ammo_boxes.dm 2020-07-01 08:55:42 +00:00
YakumoChen
6ec2cba2be Update laser.dm 2020-07-01 08:54:42 +00:00
YakumoChen
36592431a9 Update pistol.dm 2020-07-01 08:53:54 +00:00
Putnam3145
ee2fedd4af Merge pull request #12390 from Ghommie/Ghommie-cit800 
Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.
 2020-06-29 12:44:33 -07:00
silicons
45a6061958 Merge pull request #12596 from Ghommie/Ghommie-cit819 
Porting further material datum features and improvements.
 2020-06-27 14:53:28 -07:00
silicons
8b04fd70de Merge pull request #12615 from Ghommie/Ghommie-cit821 
Solving several issues.
 2020-06-27 14:52:59 -07:00
Timothy Teakettle
334d55bef3 add support for custom blood colours 2020-06-26 20:29:40 +01:00
Ghommie
8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
kevinz000
118ac1a775 Merge pull request #12548 from timothyteakettle/more-events 
ports several tg events including fugitives
 2020-06-17 20:10:04 -07:00
timothyteakettle
a61b63c1aa fix ricochets properly 2020-06-16 01:18:45 +01:00
timothyteakettle
002fa1da1d how did i fuck that up 2020-06-16 00:34:28 +01:00
timothyteakettle
35aa1c4520 merge conflict fixes 2020-06-15 23:56:46 +01:00
timothyteakettle
61c338ca8c Merge branch 'embed-changes' of https://github.com/timothyteakettle/Citadel-Station-13 into embed-changes 2020-06-15 23:50:35 +01:00
timothyteakettle
e010212180 please work 2020-06-15 23:49:38 +01:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Timothy Teakettle
d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
kevinz000
8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000
3752aecfdb fix 2020-06-13 11:30:37 -07:00
kevinz000
180b7d31d9 sigh 2020-06-13 09:24:22 -07:00