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-14 11:52:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,182 Commits 55 Branches 0 Tags
cd5317d1375d6e4efc901b807b9f52f52460699b
Commit Graph

7677 Commits

Author SHA1 Message Date
deathride58
f6ab8f24e9 Merge pull request #8233 from Poojawa/prefwindow-fixes 
Pref Window Alignment + cycled backgrounds from Virgo
 2019-04-13 17:44:50 -04:00
kevinz000
03ae39f95a Merge pull request #8232 from Poojawa/voremobs 
Vore capable simple mobs & fixes
 2019-04-13 00:21:42 -07:00
kevinz000
a2c75aad76 Merge pull request #8234 from Trilbyspaceclone/patch-98 
Removes glycerol from tier 4 dispensers
 2019-04-13 00:21:02 -07:00
kevinz000
650b0e6be6 Merge pull request #8231 from Poojawa/hypotweaks 
Labcoats carry mk II hypos, hypokits hold more
 2019-04-13 00:20:05 -07:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Trilbyspaceclone
690183b14f Update chem_dispenser.dm 2019-04-11 16:08:42 -04:00
Trilbyspaceclone
be6dbd415e Update chem_dispenser.dm 2019-04-11 15:07:45 -04:00
Poojawa
8520c91a98 Pref Window Alignment + cycled backgrounds from Virgo 2019-04-11 14:05:40 -05:00
Poojawa
4dcbaa8c80 Refractors simple mob vore code, enables vore mobs 
also just removes the mistake that was hunger sounds.
 2019-04-11 11:15:25 -05:00
Poojawa
45b8889562 Devourable mobs are digestible again 2019-04-11 07:13:19 -05:00
Poojawa
30dbc57e75 Labcoats carry mk II hypos, kits hold more 2019-04-11 06:55:57 -05:00
Poojawa
7ffe49c511 Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks 2019-04-09 22:18:56 -05:00
deathride58
69ba76f16f *vzdokh 2019-04-09 19:12:59 -04:00
Trilbyspaceclone
8fec3e3d1c fixed more grammar 2019-04-08 15:32:23 -04:00
Trilbyspaceclone
bff53530f4 tastes 2019-04-08 02:49:48 -04:00
Trilbyspaceclone
d9d2f4de7a grammar and balance 2019-04-08 02:46:39 -04:00
Trilbyspaceclone
f315250fc4 Update drinnerware.dm 2019-04-08 02:39:37 -04:00
Trilbyspaceclone
7f526242c3 grammar and lowering of Well made 5 -> 2 2019-04-08 02:39:17 -04:00
Trilbyspaceclone
e615038836 Update snacks_other.dm 
Traditionally, an onigiri is filled with pickled salted salmon, katsuobushi, kombu, tarako, or any other salty or sour ingredient as a natural preservative.
 2019-04-08 02:35:27 -04:00
Trilbyspaceclone
7d3b71938f grammar and "Bitsize fix" 2019-04-08 02:25:22 -04:00
Trilbyspaceclone
4772f12d54 Update drinnerware.dm 2019-04-07 19:52:48 -04:00
Trilbyspaceclone
47e0f5b946 Update recipes_misc.dm 2019-04-07 19:50:52 -04:00
Trilbyspaceclone
b4b9e57058 Update recipes_meat.dm 2019-04-07 19:50:09 -04:00
Poojawa
e6ea9f8ae7 Let's make sure these don't get overriden either because wtf 2019-04-07 18:44:41 -05:00
Trilbyspaceclone
d7b37fcf83 reblance 2019-04-07 19:43:59 -04:00
Trilbyspaceclone
4bb465a7d8 reblance 2019-04-07 19:42:27 -04:00
Poojawa
a90ccc89e4 Fixes human tails and ears defaulting to none in save files 2019-04-07 18:29:52 -05:00
kevinz000
a4a1f77c0f Merge pull request #8220 from Poojawa/master 
fixes floaty-leg syndrome for xenos and random color issues
 2019-04-07 15:13:00 -07:00
kevinz000
b57214dfdc Merge pull request #8190 from deathride58/removeomega 
Remove kebab's omegastation's job changes
 2019-04-07 14:49:58 -07:00
kevinz000
1c297c186e Merge pull request #8219 from Coolgat3/berets 
Berettide!
 2019-04-07 14:49:24 -07:00
izzyinbox
0e6b1bdc2f adds TGS command for adding ckeys to the panic bunker bypass 2019-04-07 01:45:47 -05:00
kevinz000
26c68e70d1 Merge pull request #8158 from Trilbyspaceclone/patch-86 
Makes Suit miner vouchers buyable and a Miner replacement bag
 2019-04-06 19:17:01 -07:00
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad 
Addtion ways to deal with radiation
 2019-04-06 19:14:46 -07:00
kevinz000
90c86574d3 Merge pull request #8212 from CameronWoof/responsibility 
Comments out hunger noises until an intermediate coder adds a preference for it
 2019-04-06 19:12:49 -07:00
Poojawa
3af678fc23 somehow didn't save? even after a compile check? Nanithefuck 2019-04-06 17:09:43 -05:00
Poojawa
294349125e fixes floaty-leg syndrome for xenos 
also fixes random gen colors from bugging out, idk why it was working just fine before but whatever
 2019-04-06 16:32:29 -05:00
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Trilbyspaceclone
94f97ba58d Update all_nodes.dm 2019-04-06 15:15:55 -04:00
Trilbyspaceclone
62e711f69d Update snacks_meat.dm 2019-04-06 13:03:01 -04:00
Poojawa
6a26220fea Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into muzzled-masks 2019-04-06 02:27:58 -05:00
deathride58
70ace01312 Merge pull request #8211 from Poojawa/hypo-belts 
Medical belt overlays + hypo storage
 2019-04-05 20:13:55 -04:00
deathride58
6259210a33 Merge pull request #8198 from Poojawa/Randomize-tweaks 
Species Spawn tweaks and tauric plasmaman suit icons
 2019-04-05 20:11:59 -04:00
Poojawa
86043e9fa5 cleans up leg swap code, makes the character updator a bit more aggressive 2019-04-05 18:30:36 -05:00
Trilbyspaceclone
6b9e9e23bf Update recipes_meat.dm 2019-04-05 18:44:02 -04:00
Trilbyspaceclone
e6ff7f811b Update recipes_misc.dm 2019-04-05 18:27:59 -04:00
Trilbyspaceclone
78caec991a 15 is 3 x 5 more lucky? 2019-04-05 18:08:05 -04:00
Trilbyspaceclone
8098cd8fd7 Update recipes_meat.dm 2019-04-05 17:58:55 -04:00
Trilbyspaceclone
9a4a315118 Update recipes_meat.dm 2019-04-05 17:44:18 -04:00
Trilbyspaceclone
8036f25ad9 Update recipes_misc.dm 2019-04-05 17:30:39 -04:00
Trilbyspaceclone
870b0d6cd8 Update recipes_meat.dm 2019-04-05 17:29:12 -04:00