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-26 01:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,064 Commits 55 Branches 0 Tags
6a92c47d31872f8f10f9403d59412493b51d7ecf
Commit Graph

21526 Commits

Author SHA1 Message Date
kevinz000
6a92c47d31 Merge pull request #11870 from Trilbyspaceclone/patch-343 
Catnip is no longer a mime plant
 2020-04-17 05:42:17 -07:00
kevinz000
4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683 
Fixing some dog tier issue.
 2020-04-17 05:40:50 -07:00
kevinz000
359790f5af Merge pull request #11876 from Citadel-Station-13/Ghommie-patch-2 
Made light bulb/tubes actually use vis_overlays instead of overlays.
 2020-04-17 05:40:32 -07:00
kevinz000
e84e6bface Merge pull request #11857 from Trilbyspaceclone/race_drinks 
Race drinks!
 2020-04-17 05:20:53 -07:00
kevinz000
61f833b953 Merge pull request #11852 from Ghommie/Ghommie-cit681 
Custom skin tone preferences.
 2020-04-17 05:16:04 -07:00
jjpark-kb
4a38b2870a fix youtool 2020-04-17 01:02:52 -04:00
Trilbyspaceclone
6f4a3fc179 wine to jello 2020-04-16 17:51:03 -04:00
Ghom
e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes 
Its no longer possible to craft multiple things at a time
 2020-04-16 19:08:09 +02:00
Ghom
10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329 
Six new Sci based bounties!
 2020-04-16 19:06:48 +02:00
Ghom
19f79f8843 Merge pull request #11611 from monster860/patch-2 
Makes so turning in place updates riders when riding someone's back
 2020-04-16 19:06:10 +02:00
Ghom
bceca18626 Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1 
you can no longer knock out xenomorphs by punching them in the face i guess
 2020-04-16 19:04:16 +02:00
Ghommie
2200c690f7 configs 2020-04-16 18:44:05 +02:00
Ghom
ad6a2b4671 Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4 
Contractor kits are now poplocked to 30.
 2020-04-16 14:46:20 +02:00
Ghom
7cacdb9db7 Merge pull request #11879 from Seris02/magboooooooooooots 
fixes magboots
 2020-04-16 14:21:58 +02:00
Seris02
c0ff018bef fixes magboots 2020-04-16 16:23:55 +08:00
Ghom
750acd7023 Update lighting.dm 2020-04-16 05:42:08 +02:00
Ghommie
7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
Trilbyspaceclone
93029c9596 le sigh 2020-04-15 14:48:22 -04:00
Trilbyspaceclone
742654b1d2 Update alcohol_reagents.dm 2020-04-15 10:44:51 -04:00
UristMcAstronaut
ec452de0b2 Merge remote-tracking branch 'upstream/master' 2020-04-15 08:41:17 +00:00
Trilbyspaceclone
3def6b861f Update drink_events.dm 2020-04-14 20:04:18 -04:00
Trilbyspaceclone
8410d6f35f Why are you like this coffee 2020-04-14 19:40:52 -04:00
Trilbyspaceclone
c4f951b80b Tho it IS ment to be 6 not 10 2020-04-14 19:35:23 -04:00
TrilbySpaceClone
d49210fd48 Merge branch 'master' into race_drinks 2020-04-14 19:21:47 -04:00
TrilbySpaceClone
a46a6227a9 Finally done... 2020-04-14 19:11:53 -04:00
Linzolle
d43cb78b8b one more 2020-04-14 18:02:51 -05:00
Linzolle
166370fb6c missed one 2020-04-14 17:55:22 -05:00
Linzolle
39e6541ccd remove bad words 2020-04-14 17:54:07 -05:00
Linzolle
f828f4c4b7 Merge remote-tracking branch 'forrest/wewlad' into tos-compliance 2020-04-14 17:33:47 -05:00
Ghommie
d84ef22f22 I'm amazed this actually works fine. 2020-04-14 21:58:37 +02:00
Lin
79f41bc654 Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4 
Hardsuit helmet peeve.
 2020-04-14 18:37:31 +00:00
Ghommie
c774f18758 . 2020-04-14 19:18:08 +02:00
Ghommie
571584901c Custom skin tone preferences. 2020-04-14 19:10:28 +02:00
UristMcAstronaut
1eafcbeb1e Add files via upload 2020-04-14 16:22:16 +00:00
UristMcAstronaut
ec734475cc Add files via upload 2020-04-14 16:21:30 +00:00
TrilbySpaceClone
79a72a50d4 this is annoying, why is angel not defind as a race 2020-04-14 11:13:49 -04:00
Ghom
49e36e47ff Merge pull request #11809 from kevinz000/storage_rework 
Adds baystation-style volumetric space storage support
 2020-04-14 13:17:11 +02:00
Ghom
5d01e05991 Merge pull request #11618 from Arturlang/Garlic 
Adds garlic, and tweaks bloodsuckers a bunch.
 2020-04-14 12:38:34 +02:00
kevinz000
3ec71612e7 Update uplink_bundles.dm 2020-04-14 01:49:14 -07:00
kevinz000
b10c479d16 Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3 
Gives a cooldown to the crusher's vortex talisman trophy.
 2020-04-14 01:37:36 -07:00
kevinz000
7861b044ea Merge pull request #11826 from Ghommie/Ghommie-cit675 
Body size preferences! Oh no!
 2020-04-14 01:35:46 -07:00
kevinz000
5baa5ebf55 Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2 
Fixes toilet cistern loot spawning on the floor.
 2020-04-14 01:35:04 -07:00
kevinz000
1f900f0e9d Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5 
Fixing a whacky miniature cell duping issue.
 2020-04-14 01:34:45 -07:00
kevinz000
e271376c4e Merge pull request #11830 from Ghommie/Ghommie-cit676 
Fixes the phantom thief component, again
 2020-04-14 01:34:18 -07:00
kevinz000
2961bf8698 Merge pull request #11838 from kappa-sama/gamingtime 
makes circuit theft admin only
 2020-04-14 01:33:06 -07:00
Artur
fb7dc7a54c Fucking icons 2020-04-14 09:42:11 +03:00
Artur
356f2913d7 Ghommies suggestions and renames a proc 2020-04-14 09:30:14 +03:00
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
Putnam3145
d1bdcd3401 Merge pull request #11840 from Citadel-Station-13/Ghommie-patch-1 
Actually fixed wizard garbs.
 2020-04-13 17:26:55 -07:00
kevinz000
6d7cc834f6 Merge pull request #11379 from Ghommie/Ghommie-cit611 
Polychromic element.
 2020-04-13 17:10:45 -07:00