Commit Graph

9869 Commits

Author SHA1 Message Date
Ghommie
3d0cb39e91 Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured. 2019-09-22 18:42:47 +02:00
lolman360
6598a8c9c2 Pooj 2019-09-22 16:18:15 +10:00
kevinz000
e44f52d89a Merge pull request #9122 from Sishen1542/oops-i-did-it-again
nerf gygax melee damage, removes mech KO punches and replaces with extra knockback (and also neuters actuator overload)
2019-09-21 19:07:40 -07:00
kevinz000
72cbaf1307 Merge pull request #9307 from BurgerLUA/Jetpack-Tweak
Reduces jetpack speed bonus on CERTAIN jetpacks while doubling efficiency
2019-09-21 19:04:11 -07:00
Fermi
bbe6b4ab15 Okay! Should be good. 2019-09-22 02:43:12 +01:00
Fermi
0dcdede8fa In response to poll and feedback. 2019-09-22 02:28:59 +01:00
Raptorizer
6747918397 Description changes 2019-09-21 19:43:52 -05:00
Raptorizer
82fec870ca Final changes 2019-09-21 19:13:33 -05:00
Fermi
167ffde648 OOPS 2019-09-21 14:07:23 +01:00
Fermi
97fa05f446 Merge branch 'master' into tg-Organ-port 2019-09-21 14:01:52 +01:00
Fermi
13c28933c6 There we are 2019-09-21 13:51:27 +01:00
Fermi
4aca2c1b31 Breakout 2019-09-21 13:23:28 +01:00
Fermi
f8dfb1e3aa Okay. 2019-09-21 12:45:10 +01:00
TrilbySpaceClone
45a5b4974d Merge branch 'master' into unmodular_2 2019-09-21 06:21:06 -04:00
Fermi
a3ae942c1d Okay.. I think this fixes it all. 2019-09-21 11:13:20 +01:00
Fermi
f0ea842c17 lil tweaks. 2019-09-21 09:58:37 +01:00
kevinz000
5608d37fd5 Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
2019-09-21 01:56:41 -07:00
kevinz000
15aab80d75 Merge pull request #9253 from chefferz/chefferz-balance1
Doubles stamina regen when standing/laying down
2019-09-21 01:48:20 -07:00
kevinz000
313956002b Merge pull request #9269 from Thalpy/FermiGrenades
Re-enables fermichem mechanics for grenades, nuances heat for general handling and enables SDGF/hatmium explosions.
2019-09-21 01:46:22 -07:00
kevinz000
3e899e59f9 Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
2019-09-21 01:45:11 -07:00
kevinz000
f259d98d7a Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
2019-09-21 01:43:52 -07:00
kevinz000
1fda7755d3 Merge pull request #9298 from Ghommie/Ghommie-cit197
Fixes undershirts n socks colors prefs.
2019-09-21 01:43:10 -07:00
kevinz000
5c8e585010 Merge pull request #9292 from Ghommie/Ghommie-cit94
Fixes clown shoes and work boots.
2019-09-21 01:42:03 -07:00
kevinz000
f898c99f62 Merge pull request #9304 from Trilbyspaceclone/bs_blood
Its a blood bath! A BlueSpace Blood Bath!
2019-09-21 01:39:29 -07:00
kevinz000
7d192c305a Merge pull request #9306 from kappa-sama/voidcell
Abductor batteries can be used to unlock abductor research
2019-09-21 01:39:08 -07:00
kevinz000
30fa8d8231 Merge pull request #9293 from Ghommie/Ghommie-cit195
leftover legcuffs/handcuffs overlays fix.
2019-09-21 01:38:14 -07:00
kevinz000
a9965d64b3 Merge pull request #9312 from Linzolle/ligament
ports ligament surgeries as well as dissection
2019-09-21 01:37:47 -07:00
Fermi
a08c1229d6 OKAY now I'm done I think. 2019-09-21 09:31:53 +01:00
Fermi
4b44b31aa3 Okay, feature done 2019-09-21 08:24:46 +01:00
Fermi
2b80998f64 Adds: cybernetic_heart_u and VV viewer. 2019-09-21 04:19:34 +01:00
YakumoChen
e297dbd0a3 Update energy_gun.dm 2019-09-21 02:39:47 +00:00
Fermi
491ff293c5 Tweaks and jazz 2019-09-21 02:59:06 +01:00
Fermi
2bd5ee184d THIS SHOULDN'T FIND IT'S WAY INTO A PR 2019-09-21 01:50:39 +01:00
Fermi
079fbbed2b Merge branch 'Reagents_bitflats' into Wiki-fermi 2019-09-21 01:40:13 +01:00
Fermi
0d49fdff54 Blob 2019-09-21 01:37:35 +01:00
Fermi
37a1e39744 Merge branch 'master' into Wiki 2019-09-21 01:29:45 +01:00
Fermi
f37215ec5a Okay, few misses. 2019-09-21 01:26:48 +01:00
Fermi
5b11ffd281 Should be kinda working maybe. But with feeling!! 2019-09-21 01:23:26 +01:00
Linzolle
8bc8a0e440 fix shit 2019-09-20 18:25:36 -05:00
Sishen
43f39a75d6 Update runes.dm 2019-09-20 18:45:44 -04:00
Sishen
37d52239e3 Update runes.dm 2019-09-20 18:39:50 -04:00
Fermi
8b477a8bcf Edits output to be a .md and now you can open it in game!! Magic! 2019-09-20 23:30:51 +01:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Fermi
13cf5a7822 Updates 2019-09-20 22:51:14 +01:00
Linzolle
deeceafb77 cult fixes 2019-09-20 16:38:37 -05:00
Fermi
59c82894a1 Sprinkles! 2019-09-20 22:15:55 +01:00
Ghommie
1f2c19c1da ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer. 2019-09-20 22:57:06 +02:00
Fermi
55c3a48026 Oops 2019-09-20 21:56:39 +01:00
Fermi
d12fd72ebf Updates a buncha stuff. 2019-09-20 21:11:20 +01:00
Fermi
e6a5530363 Fixes 2019-09-20 20:06:38 +01:00