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
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

856 Commits

Author SHA1 Message Date
silicons
924309aab8 changeS 2020-07-20 11:11:12 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
6ab250dd03 sigh 2020-07-20 10:13:50 -07:00
Keate Senior
21af6d4805 same as last commit but I actually stage all the right files 2020-07-20 03:20:13 -04:00
silicons
ae83a6df02 fix 2020-07-19 19:51:17 -07:00
Enric Gabriel
7a1d5acd9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 - may FUCK 2020-07-19 18:58:33 -03:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
silicons
b1ccccb322 more 2020-07-18 18:51:16 -07:00
silicons
1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons
0c6368e3e7 e 2020-07-18 18:34:16 -07:00
silicons
0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons
771a28e685 oh boy 2020-07-18 17:48:51 -07:00
Timothy Teakettle
a89a55a0cc indentation fix 2020-07-18 23:23:25 +01: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
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Enric Gabriel
05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
timothyteakettle
584e74590f port1 2020-07-17 02:01:33 +01:00
silicons
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
silicons
de8ac9896a sigh 2020-07-11 07:13:56 -07:00
silicons
cc2e9530b1 fix 2020-07-11 00:44:17 -07:00
silicons
8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
5246408622 fix 2020-07-07 20:51:34 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel
83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03: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
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00
Ghommie
396989f143 Fixes items' used skills list keys missing associated base traits. 2020-07-03 01:52:03 +02:00
Artur
6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Enric Gabriel
1207761468 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-02 13:56:39 -03:00
silicons
3f1119fcdb Merge pull request #12630 from Ghommie/Ghommie-cit822 
You can't (un)equip garments on/from obscured inventory slots anymore.
 2020-07-02 01:44:59 -07:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Enric Gabriel
d505bf0716 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-28 13:33:22 -03:00
Ghommie
a34a7ba5d4 You can't (un)equip garments on/from obscured inventory slots anymore. 2020-06-28 01:10:22 +02:00
Ghommie
c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Enric Gabriel
776b763e17 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-22 07:03:48 -03:00
kevinz000
445d94f335 haha whew 2020-06-17 21:32:10 -07:00
Enric Gabriel
cb261a1b74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-17 20:23:21 -03:00
Artur
ceba739231 Cooonflicts 2020-06-16 01:23:42 +03:00
Timothy Teakettle
7fbfb4ad0e Merge remote-tracking branch 'upstream/master' into embed-changes 2020-06-15 22:48:26 +01:00
Enric Gabriel
6f735e0d40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-06-12 21:27:31 -03:00
Ghom
77c428479e changes the inefficient attack message string and threshold. (#12498) 2020-06-12 17:08:10 -07:00
Timothy Teakettle
4c55e86da7 part 2 2020-06-10 23:14:25 +01:00
Artur
b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00