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 2026-01-06 07:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,114 Commits 55 Branches 0 Tags
05684e7196648d11238b0ec91022e3c7fc48e319
Commit Graph

23053 Commits

Author SHA1 Message Date
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Letter N
45a3c47608 removes fun 2020-07-08 15:10:49 +08:00
Lin
33f56fd168 Merge pull request #12694 from Ghommie/Ghommie-cit833 
mowing down experimental cloner copypasta.
 2020-07-07 13:23:25 -05:00
silicons
5b09b68c6d Merge pull request #12702 from DeltaFire15/actually-kill-once 
[s] Fixes the 'Kill once' objective
 2020-07-06 17:38:24 -07:00
silicons
0c0bf46f7f Merge pull request #12696 from Chiirno/emichemmastertweak 
increased the amount of stuff the chem master can dispense from 10 to 20
 2020-07-06 17:34:50 -07:00
silicons
4fa7a461ef Merge pull request #12684 from Owai-Seek/foodport-p1-7/1/20 
Food ports, tweaks, and fixes.
 2020-07-06 17:19:07 -07:00
Ghom
c2746c723e Merge pull request #12698 from Owai-Seek/beebalmfix-7-4-20 
Fixes Bee Balm
 2020-07-07 00:22:33 +02:00
DeltaFire
eeadc9a0e7 fixes the kill once objective 
the target being afk / disconnecting is now only accepted at roundend, and doesn't lead to it being regarded as permanently completed midround.
 2020-07-06 23:00:36 +02: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
Ghommie
afb5b5237c linter & stuff. 2020-07-06 22:42:32 +02:00
Winter Flare
482785d922 Fixes Bee Balm 2020-07-05 19:14:03 -04:00
Cirno
45d97b2251 increased the amount of stuff the chem master can dispense from 10 to 20 2020-07-05 11:17:37 -03:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Lin
703d03453b Merge pull request #12651 from Citadel-Station-13/silicons-patch-9 
lowers shield blocking stamcost/second 3.5 to 2.5
 2020-07-04 14:16:06 -05:00
Lin
4d29aa9148 Merge pull request #12650 from Citadel-Station-13/silicons-patch-7 
adds a keybind to toggle active blocking instead of only press-hold
 2020-07-04 14:13:18 -05:00
Lin
d04b335d1a Merge pull request #12652 from silicons/cool 
cybernetic implant shields will now automatically extend and be used to block if the user has no item to block with
 2020-07-04 14:12:43 -05:00
Ghommie
3ba077be71 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit833 2020-07-04 21:04:33 +02:00
Ghommie
780f30bd4d Fixing cloning 2020-07-04 21:01:44 +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
Ghom
c5b94a4d00 Update code/modules/antagonists/revenant/revenant.dm 2020-07-04 18:30:01 +02:00
silicons
ca6fc8d813 Update revenant.dm 2020-07-04 06:48:00 -07:00
silicons
bb065abab7 Merge pull request #12690 from BlackMajor/master 
[s] Inheritance is something often overlooked.
 2020-07-04 01:52:13 -07:00
BlackMajor
afdf8c698a fuck 2020-07-04 19:30:20 +12:00
silicons
03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
silicons
ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07: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
dbf88a1408 Merge pull request #12676 from Ghommie/Ghommie-cit829 
Improvements to the recent clothing menu toggle hardsuit helmet feature.
 2020-07-04 00:12:29 -07:00
silicons
a61e22de71 Merge pull request #12675 from Ghommie/Ghommie-cit828 
Fixing (un)equip penalties from obscured inv slots.
 2020-07-04 00:12:04 -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
e9c4ac8c3c Merge pull request #12658 from timothyteakettle/okay-its-bad 
slightly tweaks the cooking oil damage formula
 2020-07-04 00:11:09 -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
silicons
94b001ad6b Merge pull request #12685 from Citadel-Station-13/Ghommie-patch-1 
Silences the skill panel check_rights() call.
 2020-07-04 00:10:29 -07:00
BlackMajor
7c21f7bd4e [s] Don't give these to your kids for christmas 
Someone did a fucky wucky.
 2020-07-04 17:17:34 +12:00
Weblure
832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
Weblure
c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Weblure
bc76fa615d Fixed small strides formula 2020-07-03 17:05:56 -07:00
Ghom
22d0e7ee0b Merge pull request #12672 from Sonic121x/patch-3 
add crushed sodacan and some digitigrade uniform sprite.
 2020-07-03 19:59:36 +02:00
Ghommie
e3b1ca4942 Linter. 2020-07-03 19:57:38 +02:00
Ghommie
bde80eb1fb Fixing obscured inventory slots (un)equip block, for real. 2020-07-03 19:02:20 +02:00
Ghom
ea8662572b Silences the skill panel check_rights() call. 2020-07-03 17:37:03 +02:00
Winter Flare
870bb8f804 Actual BLT Stuff 
This is why I test things. Also, I shouldn't do this before I try to sleep.
 2020-07-03 09:48:35 -04:00
Winter Flare
bef462b4ae BLT Sandwich 2020-07-03 08:50:54 -04:00
Winter Flare
5b923623d3 Sprite Updates + Food Ports 
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)

Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)

Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
 2020-07-03 08:33:01 -04:00
kappa-sama
05591ee04c better 2020-07-03 05:40:18 -04:00
silicons
824d11b085 death to lists 2020-07-03 02:34:59 -07:00
silicons
d85edbf8fb ok 2020-07-03 02:15:06 -07:00
Ghommie
f5ffd7d2a9 Easing fine tuning of the system. 2020-07-03 03:00:33 +02:00