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-12 19:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,363 Commits 55 Branches 0 Tags
1a047c0068658dc44b3fa8932feee7f727a4a91f
Commit Graph

12650 Commits

Author SHA1 Message Date
Poojawa
1a047c0068 I think I got it. 
Also gibs should be better too.
 2019-05-12 04:06:35 -05:00
Poojawa
fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Poojawa
11c54f5fba Update human_movement.dm 2019-05-09 14:43:12 -05:00
Poojawa
88831da8f4 it's the one part that I keep saying I just need to get around to 2019-05-09 14:43:05 -05:00
Poojawa
8af9c6fad9 duplicate definitions? really? wtf 2019-05-09 10:32:14 -05:00
Poojawa
3f6cd92d54 Ok this time all of them are nitpicked 2019-05-09 10:15:51 -05:00
Poojawa
0f02562b51 Fixes Xenomorph blood related travis errors 2019-05-09 09:59:34 -05:00
Poojawa
7b6a65ce3b okay we're starting to pass our blood type to bloodmeme now 
STILL JUST FUCKING FOOTSTEPS LEFT THO GOD FUCKING DAMNIT
 2019-05-09 08:17:18 -05:00
Poojawa
5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Poojawa
5a67114d33 get blood id is my foe now. 2019-05-08 04:53:51 -05:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer 
Makes a new COMBAT inducer! - Admin only
 2019-05-08 01:34:33 -07:00
Poojawa
69eca2ae4b progress, just need to fiddle with footprints again 2019-05-07 13:23:49 -05:00
Poojawa
d14943d4b0 well we have footprints now, xenoblood back to blood subtype. 2019-05-07 05:29:45 -05:00
deathride58
2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44 
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
 2019-05-07 02:19:40 -04:00
deathride58
a3317ffe89 Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43 
ASIMOV: human being --> "person of a NT approved crew species"
 2019-05-07 02:19:28 -04:00
deathride58
f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106 
Buffs blob Shield armor, as well as weaken state
 2019-05-06 22:13:50 -04:00
deathride58
5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45 
vent_clog event now respects vent welding
 2019-05-06 22:08:43 -04:00
deathride58
24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48 
disables skewium due to severe code issues
 2019-05-06 22:08:16 -04:00
deathride58
9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47 
adds message monitor to telecomms technode
 2019-05-06 22:04:12 -04:00
deathride58
0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco 
Muzzled Medical hardsuit fix and sprite organization
 2019-05-06 21:58:44 -04:00
deathride58
aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha 
Unironically adds elf ears
 2019-05-06 21:23:55 -04:00
deathride58
bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix 
Fixes a few Slurring bugs
 2019-05-06 21:00:33 -04:00
deathride58
1a483f19a2 Merge pull request #8305 from Poojawa/NPR-for-discord 
Brings NTPR to the nice discord bot
 2019-05-06 20:56:28 -04:00
Trilbyspaceclone
9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -04:00
deathride58
8abd98cec7 Merge pull request #8162 from Trilbyspaceclone/patch-87 
[Ready] Makes Cursed Katana's be Cursed once more
 2019-05-06 19:24:38 -04:00
Trilbyspaceclone
fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
Poojawa
996662ebea adjust and reset things 2019-05-06 04:35:09 -05:00
Poojawa
105b40a4f8 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-06 02:53:42 -05:00
Trilbyspaceclone
5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone
7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone
cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone
5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
Trilbyspaceclone
642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04:00
kevinz000
383cae2949 Merge pull request #8317 from deathride58/herewegoagain 
[s] Clamps biogen amount to a sane amount
 2019-05-04 23:18:36 -07:00
kevinz000
1b387eb5e3 Merge pull request #8314 from Poojawa/mawp 
Mawp
 2019-05-04 23:18:14 -07:00
kevinz000
1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115 
Maybe fixes laser carbine sprites
 2019-05-04 23:17:51 -07:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
deathride58
7dd5e563b0 Clamps biogen amount to a sane amount 2019-05-02 00:21:38 -04:00
Trilbyspaceclone
831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -04:00
Trilbyspaceclone
150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone
fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
Poojawa
faeb4bc22d Mawp 
Mawp
 2019-05-01 00:58:19 -05:00
BurgerLua
b31127bcca Forgot this 2019-04-30 22:26:44 -07:00
Poojawa
be0829af53 cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes 2019-05-01 00:10:27 -05:00
Poojawa
9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
BurgerLua
d3b856d95f slurring reduction 2019-04-30 22:00:27 -07:00
BurgerLua
22c0c9baec Slurring Fix 2019-04-30 21:29:28 -07:00
kevinz000
534b5f0287 Merge pull request #8309 from Trilbyspaceclone/Food-5 
Better sushi crafting, and tuna based food - Works addtion
 2019-04-30 05:42:30 -07:00
kevinz000
7466f48674 Merge pull request #8288 from BurgerLUA/Accesssssssssssss 
Accessory Clothing Mayhem, or how I lost my fucking sanity making this PR.
 2019-04-30 05:37:02 -07:00
kevinz000
7fe7b2d30f Merge pull request #8286 from BurgerLUA/AlcoholTweaks 
Tweaks how Slurring works and makes slurring directly proportional to drunkeness.
 2019-04-30 05:32:20 -07:00