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-27 02:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,341 Commits 55 Branches 0 Tags
147a905b5d4f6bbb51aeb51e6b45f7a58dd9a44f
Commit Graph

2940 Commits

Author SHA1 Message Date
silicons
147a905b5d Merge pull request #12783 from Sneakyrat6/oocNotesExploit 
Fixes seeing real name in OOC Notes
 2020-07-15 14:48:55 -07:00
Sneakyrat6
538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records 
adds security/medical records to character setup
 2020-07-13 11:50:02 -05:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact 
port examines and eye contact
 2020-07-11 00:14:47 -07:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01: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
silicons
cee15792b7 ok 2020-07-07 07:25:10 -07:00
Ghom
e7d19f512e Merge pull request #12397 from Rohesie/cooldown 
Ports TGMC timer cooldowns
 2020-07-06 22:54:58 +02:00
Ghom
bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix 
[READY] Fixes Small Strides Formula
 2020-07-06 22:48:09 +02:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02: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
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
silicons
f6be57269d Merge pull request #12687 from Ghommie/Ghommie-cit832 
Fixing obscured inventory slots unequip block, for real.
 2020-07-04 00:10:49 -07:00
Weblure
bc76fa615d Fixed small strides formula 2020-07-03 17:05:56 -07:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghom
ea8662572b Silences the skill panel check_rights() call. 2020-07-03 17:37:03 +02:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02: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
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07: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
Putnam3145
42809d8b0c Merge pull request #12416 from Ghommie/Ghommie-cit792 
TGUI-next Check Skills menu.
 2020-06-29 12:44:08 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
Ghommie
5307676317 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit792 2020-06-29 06:55:35 +02:00
Ghommie
65ffadaa18 Few issues, solved. 2020-06-28 04:51:02 +02:00
silicons
e51bee9649 Merge pull request #12607 from Detective-Google/cog-2 
cog fixes round 2
 2020-06-27 14:54:31 -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
L
3aefc8ae10 tg changes 2020-06-27 07:01:19 -03:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie
8f6b31c26e Solving several issues. 2020-06-26 18:40:20 +02:00
Detective Google
57fca41e20 aeugh2 2020-06-25 15:22:11 -05:00
Ghommie
04902e1fc5 Whoops 2020-06-24 23:32:31 +02:00
Ghommie
c0e0226d3c faction check. 2020-06-24 23:18:03 +02:00
Ghommie
fe3932a36e Fixing the snore-pocalypse, and another not so critical issue. 2020-06-24 23:08:40 +02:00