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,576 Commits 55 Branches 0 Tags
ba3dc6a73b588829a181fb387f20be60b1f0d201
Commit Graph

23350 Commits

Author SHA1 Message Date
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32 
removes tango dancing
 2020-07-18 11:17:42 -05:00
Putnam
d88ade40bf actually fixes uplink 2020-07-18 01:51:59 -07:00
silicons
b98102a824 Merge pull request #12762 from zeroisthebiggay/a 
drops martial art minpops down to twenty pop
 2020-07-17 17:11:02 -07:00
silicons
a8e2b84ad8 Merge pull request #12763 from zeroisthebiggay/b 
hopefully fixes records possibly
 2020-07-17 17:10:40 -07:00
silicons
c924290cd1 Merge pull request #12733 from TheObserver-sys/Finally,moreblorble 
Slime Extractification
 2020-07-17 17:10:32 -07:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
8caf063765 Merge pull request #12757 from Owai-Seek/better-snack-comments 
Updates some comments.
 2020-07-17 17:09:50 -07:00
silicons
93d669d205 Merge pull request #12759 from YakumoChen/hierophant-hugbox 
set hierophant friendly fire check to on by default
 2020-07-17 17:09:17 -07:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo 
Even more engiborg power creep
 2020-07-17 17:08:23 -07:00
silicons
3d5c77f62b Merge pull request #12779 from b1tt3r1n0/circlegame 
Circle Game, Updated
 2020-07-17 17:08:06 -07:00
silicons
04df84d1e0 Merge pull request #12776 from timothyteakettle/snail-shells 
snail shell backpack
 2020-07-17 17:07:46 -07:00
silicons
183a929e42 Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix 
wrestling rotation fix
 2020-07-17 17:07:06 -07:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07:00
Lin
76c6c767d9 Merge pull request #12784 from silicons/shields 
fixes active block toggle not existing
 2020-07-17 14:43:40 -05:00
silicons
cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
BlackMajor
9b671b7dd1 I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list 2020-07-18 03:08:52 +12:00
BlackMajor
eb9b3da581 Blacklist logic fix 2020-07-17 16:13:18 +12:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Timothy Teakettle
ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle
a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
Artur
9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor
fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
7eab0263ba https://github.com/tgstation/tgstation/pull/51213 2020-07-16 20:51:25 +08:00
Letter N
819ca63456 https://github.com/tgstation/tgstation/pull/51679 - pickup_item missing 2020-07-16 20:42:02 +08:00
Letter N
abd0ac089d https://github.com/tgstation/tgstation/pull/51687 2020-07-16 20:36:08 +08:00
Letter N
8083efd1ad https://github.com/tgstation/tgstation/pull/51864 2020-07-16 20:29:56 +08:00
Letter N
9575c52b13 https://github.com/tgstation/tgstation/pull/52059 - the forgotten part 2020-07-16 20:21:39 +08:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
nik707
fa8a6dd3e1 Merge pull request #12788 from silicons/gasmixture_vv 
"""user-friendly""" vv handling for new c++ atmos gas mixtures
 2020-07-16 01:19:20 -05:00
timothyteakettle
8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons
7f9571f239 ok 2020-07-15 17:17:09 -07:00
silicons
b279c82bb2 whew 2020-07-15 17:10:08 -07:00
silicons
dba5855929 epic 2020-07-15 17:01:22 -07:00
silicons
96fb3cad8f ok 2020-07-15 17:00:17 -07:00
silicons
6fbd7914f5 stuff 2020-07-15 16:58:44 -07:00
Timothy Teakettle
a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons
147a905b5d Merge pull request #12783 from Sneakyrat6/oocNotesExploit 
Fixes seeing real name in OOC Notes
 2020-07-15 14:48:55 -07:00
silicons
8f478ce66a quirky uh oh 2020-07-15 14:47:59 -07:00
Timothy Teakettle
0184739005 undo the woopsy 2020-07-15 19:53:37 +01:00
Sneakyrat6
538e7c62cd Fixes seeing real name in OOC Notes 2020-07-15 13:32:56 -05:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders 
the travelling trader midround event
 2020-07-15 08:50:20 -07:00
BlackMajor
06a4e57de9 changing this just means they can pick up jetpacks 2020-07-16 02:11:38 +12:00
BlackMajor
bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
b1tt3r1n0
d678806143 Circle Game, Updated 
Title
 2020-07-14 23:40:09 -04:00
Timothy Teakettle
6be10d041c add to clothesmate 2020-07-14 21:10:37 +01:00