Commit Graph

10291 Commits

Author SHA1 Message Date
Trilbyspaceclone 651a452ed0 Update recipes.dm 2019-05-10 14:50:44 -04:00
Poojawa fcdc748bf1 u h g. I hate this 2019-05-10 07:07:09 -05:00
Scorpion-117 7a8adff8e0 testing a value of 7
x
2019-05-10 01:58:53 -06:00
Scorpion-117 9fd61b660d modifying to make it take far more power to produce
x
2019-05-10 01:55:25 -06:00
BurgerLua 8b935b9abf Reverts cooking change, adds safety checks. 2019-05-09 21:10:44 -07:00
Fermi ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
Thalpy 5287f3f9c7 Merge branch 'master' into pr/7 2019-05-10 02:20:19 +01:00
Fermi 7d567fee63 MC chem 5.5/6 2019-05-10 02:00:17 +01:00
Sishen c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
BurgerLua 6df27ef2a3 Updated integrated circuits 2019-05-09 15:25:48 -07:00
Poojawa 28eb23d474 Fixes prosthetics and missing markings 2019-05-09 16:15:03 -05:00
Poojawa 11c54f5fba Update human_movement.dm 2019-05-09 14:43:12 -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
Useroth a0d948497b Totally forgotten the abductor adrenals. 2019-05-09 13:28:04 +02:00
Useroth 83661fff9d Update abduction_gear.dm 2019-05-09 13:17:12 +02:00
Useroth 07685a1074 Abductor baton buff. Because it currently sucks balls. 2019-05-09 12:20:02 +02:00
Useroth 4355584833 Added them to loadout too. 2019-05-09 12:09:18 +02:00
Useroth abe8ed16cb A small touch-up. 2019-05-09 11:38:33 +02:00
Useroth 1efd7123f2 Two new collar types. All collars are now colorable a'la polychromic stuff. 2019-05-09 11:22:51 +02:00
Poojawa 5ad532f723 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-05-09 03:08:54 -05:00
Useroth b80bb21219 Dildo-shaped circuit assemblies. Because that's what the community needs. 2019-05-09 08:45:47 +02:00
Fermi 854c0097d4 MC 5/6th done, probably. 2019-05-08 23:13:51 +01:00
Scorpion-117 e8299db245 Readding stargazer 2019-05-08 07:44:39 -06:00
Scorpion-117 0c6d84d50e Reading stargazers
because why not
2019-05-08 07:29:50 -06:00
Scorpion-117 d0970e327c Update stargazer.dm 2019-05-08 07:21:17 -06:00
Scorpion-117 c0717561ff puts back stargazer DM
x
2019-05-08 07:20:29 -06: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
kevinz000 1e40a65536 buff this a bit 2019-05-08 01:31:00 -07:00
kevinz000 55d54592d5 Update toxin_reagents.dm 2019-05-08 01:30:24 -07:00
Fermi 1385e12fe3 MC 4/6th done 2019-05-07 23:38:50 +01: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
Trilbyspaceclone 9adeccc5e1 Update autolathe_designs.dm 2019-05-06 23:47:39 -04:00
Trilbyspaceclone ae75bf2fd1 Update autolathe_designs.dm 2019-05-06 23:46:31 -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
Trilbyspaceclone 9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -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
Fermi f31a46e029 Fixed a few things, 1/2 way through MC chem. 2019-05-05 20:32:07 +01:00
Trilbyspaceclone 5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00