Commit Graph

12547 Commits

Author SHA1 Message Date
kevinz000
709e3375ac Merge pull request #8283 from BurgerLUA/NoMoreOfThisShit
Adds a new trait that makes you immune* to Crocin and Hexacrocin
2019-04-30 05:28:55 -07:00
kevinz000
218fd09102 Merge pull request #8301 from Trilbyspaceclone/hell
[Ready] Mag gun rework MK II
2019-04-30 05:24:16 -07:00
kevinz000
970dc85b62 Merge pull request #8289 from Trilbyspaceclone/patch-111
Buffs cap hat and HOP hat
2019-04-30 05:18:52 -07:00
kevinz000
7c1d7b60d0 Merge pull request #8287 from Trilbyspaceclone/Lock_and_key
Lockable Collars - Requested by Frack
2019-04-30 05:18:14 -07:00
Trilbyspaceclone
3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
Trilbyspaceclone
a9aa855305 Update recharger.dm 2019-04-28 21:25:18 -04:00
Trilbyspaceclone
8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
Trilbyspaceclone
59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04:00
Useroth
cd5317d137 Fixed katana jaunt not working on dark tiles. 2019-04-28 15:49:00 +02:00
Trilbyspaceclone
70c5c47490 Lets not mistakenly nerf hop please? 2019-04-25 23:51:09 -04:00
Trilbyspaceclone
39fcf27beb Update jobs.dm 2019-04-25 23:48:12 -04:00
Trilbyspaceclone
33e3df8157 What in the hell? 2019-04-25 20:46:39 -04:00
Trilbyspaceclone
a69b845509 Update pockets.dm 2019-04-25 20:41:34 -04:00
Trilbyspaceclone
fcda4c0fbb Update _neck.dm 2019-04-25 20:40:48 -04:00
kevinz000
6646d39c89 Merge pull request #8277 from BurgerLUA/NoRaceChange
Significantly Reworks the Wizard Transformation Event
2019-04-25 04:34:59 -07:00
kevinz000
fd7c5a9568 Merge pull request #8279 from Trilbyspaceclone/patch-107
Fixes deathriplys armor being halfed
2019-04-25 04:34:09 -07:00
kevinz000
a23b999cc3 Merge pull request #8261 from Trilbyspaceclone/patch-101
Makes all mechs sell for legit price
2019-04-25 04:20:02 -07:00
kevinz000
70bb99410e Merge pull request #8264 from Trilbyspaceclone/patch-102
Reblances miner vender suit vouch and more
2019-04-25 04:19:35 -07:00
kevinz000
6ce3a0150f Merge pull request #8242 from Trilbyspaceclone/patch-99
Give some blob things basic armor
2019-04-25 04:18:21 -07:00
BurgerLua
1f78520b68 Adds a new trait that makes you immune from the "positive" effects of hexacrocin and crocin. 2019-04-24 20:13:21 -07:00
BurgerLua
b0a93cf790 retweaked the event instead of removing it 2019-04-23 11:51:00 -07:00
Trilbyspaceclone
ff29ade943 Hairly request 2019-04-23 12:09:58 -04:00
Trilbyspaceclone
823dd1a98a Update ripley.dm 2019-04-23 04:40:21 -04:00
Trilbyspaceclone
31f3a16777 *No gps* 2019-04-23 02:43:23 -04:00
Trilbyspaceclone
dbdd37430a Kev requests... 2019-04-23 02:42:18 -04:00
Trilbyspaceclone
1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone
415461d736 Forgot bomb armor 2019-04-23 02:32:07 -04:00
Trilbyspaceclone
073684b7bc As Kev requested 2019-04-23 02:30:55 -04:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000
8b54d33286 Merge pull request #8215 from Trilbyspaceclone/Sush
[Ready] Sushi!
2019-04-22 21:40:28 -07:00
kevinz000
6892e8d01e Merge pull request #8265 from Trilbyspaceclone/patch-103
Reblances goliath stun.
2019-04-22 21:38:33 -07:00
kevinz000
333f758e30 Merge pull request #8105 from Trilbyspaceclone/patch-76
[Ready] Makes transformation slings have a loundess of 2 factor
2019-04-22 21:34:50 -07:00
kevinz000
6be4b7b969 Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
2019-04-22 21:32:15 -07:00
kevinz000
f05b326f15 Merge pull request #8250 from Trilbyspaceclone/patch-100
[Fix] Lowers pda sounds as well as make them respect ringer off
2019-04-22 21:31:38 -07:00
Poojawa
fe1692eef3 t a b 2019-04-21 01:57:12 -05:00
Poojawa
b524c6741d double checking my work 2019-04-21 01:56:45 -05:00
Poojawa
df057544f2 Merge branch 'master' into screaming 2019-04-20 23:33:23 -05:00
Poojawa
ae7ce39f62 aaaAAAAaaaa 2019-04-20 23:28:43 -05:00
kevinz000
939bbbe3e7 Merge pull request #8182 from deathride58/optimizeshearersinview
Optimizes get_hearers_in_view by caching the results of view() in the proc
2019-04-20 16:38:20 -07:00
kevinz000
8c5db62542 Merge pull request #8244 from Poojawa/iv-dripper-punctures
Adds a can_inject check to IV Drips
2019-04-20 16:37:13 -07:00
kevinz000
d4636ddeb8 Merge pull request #8249 from Poojawa/mask-checkers
Headgear is more aggressive in setting normal style stuff
2019-04-20 16:36:26 -07:00
kevinz000
b35c366516 Merge pull request #8258 from BurgerLUA/VentClogTweak
Rework of Vent Clog Event
2019-04-20 16:36:01 -07:00
kevinz000
e521a5abd6 Merge pull request #8217 from Trilbyspaceclone/patch-95
[Ready] Makes alien alloy be able to unlock - Alien Alloy.
2019-04-20 16:33:51 -07:00
kevinz000
6291185422 Merge pull request #8259 from deathride58/fuckpaicircuits
Minor circuit balance tweaks - limits locomotion circuits to jogging speed and doubles the complexity of mmi/pai connector circuits
2019-04-20 16:29:35 -07:00
Trilbyspaceclone
7a3f8704a2 Update goliath.dm 2019-04-20 14:16:30 -04:00
Trilbyspaceclone
6dc8faf533 Update machine_vending.dm 2019-04-20 14:08:25 -04:00
Trilbyspaceclone
769102ed9c Update machine_vending.dm 2019-04-20 14:04:40 -04:00
Trilbyspaceclone
e61b4f83d8 Update large_objects.dm 2019-04-20 00:37:45 -04:00
kevinz000
c1c198f423 Merge pull request #8255 from BurgerLUA/LoadoutUITweaks
Improved the layout of the Loadout UI to be more fitting
2019-04-19 14:19:14 -07:00
Trilbyspaceclone
1a680b142f grammar 2019-04-19 14:06:02 -04:00