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
41,355 Commits 55 Branches 0 Tags
cf2e70671ae9b515a062bb3823f91bd092269e48
Commit Graph

1013 Commits

Author SHA1 Message Date
Timothy Teakettle
9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01: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
Hatterhat
8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen
27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
timothyteakettle
3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01:00
timothyteakettle
b708be60e9 hey look ma i removed a space 2020-07-25 02:12:21 +01:00
timothyteakettle
2a3f45f7af fixes 2020-07-25 01:10:12 +01:00
timothyteakettle
3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
Timothy Teakettle
7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Iatots
e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
Letter N
d5a6a3ecd9 actual code chang 2020-07-22 12:02:31 +08:00
lolman360
17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
lolman360
f33487e972 complie 2020-07-22 11:36:50 +10:00
lolman360
0f1aa3c0ca 'lolman? did you test your code?' 
no i did not ms. kevinz
 2020-07-22 10:49:56 +10:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Timothy Teakettle
b06948bed4 fry smite 2020-07-20 17:48:37 +01:00
Timothy Teakettle
a0c166c490 badmin safeguarding 2020-07-20 17:43:58 +01:00
Timothy Teakettle
c68f0559d9 old instant eating speed 2020-07-20 17:29:09 +01:00
timothyteakettle
e2b68797b7 bugfixes 2020-07-20 00:49:00 +01:00
timothyteakettle
8709a72fc0 fry everything 2020-07-20 00:40:18 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Artur
7ebc785437 fIXES UPLINK 2020-07-05 21:52:24 +03: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
103b8b7600 Merge pull request #12662 from kappa-sama/patch-29 
makes bows and arrows more feasible improv weapons
 2020-07-04 00:11:45 -07:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Lin
fa1e92d588 Merge pull request #12656 from Ghommie/Ghommie-cit826 
Fixing two handed items and etcetera.
 2020-07-01 14:30:16 -05:00
Ghom
8de00e80dd Update bag_of_holding.dm 2020-07-01 15:04:51 +02:00
kappa-sama
ad4f909d79 ashwalkers 2020-07-01 08:19:27 -04:00
kappa-sama
3695595034 ammunition 2020-07-01 08:17:13 -04:00
kappa-sama
73d616b3a4 more accurate 2020-07-01 08:13:30 -04:00
kappa-sama
49af0d11c7 string 2020-07-01 08:09:39 -04:00
kappa-sama
1fffd0a608 45 seconds lol 2020-07-01 08:02:41 -04: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
6f50664189 removes improv handguns 2020-07-01 08:48:10 +00:00
YakumoChen
35ee3e6aeb No pocket guns, unstupids part names 2020-07-01 08:43:34 +00:00
silicons
8f30d7f4d1 Update code/datums/components/storage/concrete/bag_of_holding.dm 
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-06-30 20:27:30 -07:00
Ghommie
cd1c5511a4 Fixing two handed items and etcetera. 2020-06-30 16:24:04 +02:00
silicons
837a77585c Update bag_of_holding.dm 2020-06-30 00:41:09 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00