8176 Commits

Author	SHA1	Message	Date
Useroth	231da023ec	Makes the gloves actually stun people.	2019-06-13 15:27:55 +02:00
Useroth	df15e53cd3	Another attempt at the nets not being breakable with bare hands. Now with more consideration.	2019-06-13 15:27:55 +02:00
Useroth	2e5ad2f4d8	Might as well crank it up a little more.	2019-06-13 15:27:55 +02:00
Useroth	7fd2c60992	Makes energy nets a bit sturdier and unbreakable with bare hands.	2019-06-13 15:27:54 +02:00
Useroth	04a1c7ada4	Energy net and capture objective tweak.	2019-06-13 15:27:54 +02:00
Useroth	f9c249b644	Energy net tweak to make it less clunky to use.	2019-06-13 15:27:54 +02:00
kevinz000	bd0e16461b	Merge pull request #8522 from Useroth/changeling-hentai ... Made the changeling tentacle disarm a bit more reliable.	2019-06-08 01:32:52 -07:00
kevinz000	d36b8068fa	Merge pull request #8556 from Poojawa/ninja-speak ... Gives Ninjas back their Weeb speech modification	2019-06-08 01:29:42 -07:00
kevinz000	d28754cb4d	Merge pull request #8560 from Ghommie/Ghommie-cit37 ... Ports in the fix against hitting oneself with one's own thrown items.	2019-06-08 01:27:43 -07:00
kevinz000	2f2885f1d6	Merge pull request #8558 from Ghommie/Ghommie-cit35 ... Ports in the container_type to reagents flags refactor.	2019-06-08 01:26:28 -07:00
kevinz000	aca85123be	Merge pull request #8555 from Ghommie/Ghommie-cit32 ... Updates radials, makes RCD and RCL use em.	2019-06-08 01:25:37 -07:00
kevinz000	1488af1a52	Merge pull request #8554 from Ghommie/Ghommie-cit33 ... Adds AI core screen selection to character preferences and turns icon selection menu into a radial.	2019-06-08 01:24:59 -07:00
kevinz000	eb1c767ab7	Merge pull request #8553 from Poojawa/ghost-erp ... Clarifies a few things about subtler and how it should be used	2019-06-08 01:24:36 -07:00
kevinz000	ae5d4de111	Merge pull request #8552 from Ghommie/Ghommie-cit31 ... Ports "Fixes goonchat cookies not saving properly."	2019-06-08 01:24:16 -07:00
kevinz000	95abaf6a6e	Merge pull request #8551 from Ghommie/Ghommie-cit30 ... Port paradise goonchat uridecode fix	2019-06-08 01:23:59 -07:00
kevinz000	4050ba98eb	Merge pull request #8549 from Trilbyspaceclone/patch-168 ... Fixes a unseen paper work exsplote	2019-06-08 01:23:31 -07:00
kevinz000	ab565d2483	Merge pull request #8547 from Ghommie/Ghommie-cit29 ... Moves traits to datums and turn the accessors into defines	2019-06-08 01:22:16 -07:00
kevinz000	88990f5ae0	Merge pull request #8544 from Trilbyspaceclone/patch-166 ... Makes ice cream vats and food carts buy-able via cargo	2019-06-08 01:21:41 -07:00
kevinz000	9edac9fc6c	Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss ... Rebalanced Ass Slapping	2019-06-08 01:17:04 -07:00
kevinz000	a866ceb8a2	Merge pull request #8543 from Trilbyspaceclone/patch-165 ... Makes SNOWCONES!	2019-06-08 01:15:58 -07:00
kevinz000	f458828659	Merge pull request #8503 from Trilbyspaceclone/patch-159 ... Changing up the drills/picks/jackhammer a bit	2019-06-08 01:10:34 -07:00
kevinz000	f201bd1508	Merge pull request #8494 from Trilbyspaceclone/ash_walker ... Ash walker bone satchles.	2019-06-08 01:09:26 -07:00
kevinz000	487461fbda	Merge pull request #8500 from Trilbyspaceclone/patch-158 ... Buffs stun slugs	2019-06-08 01:09:00 -07:00
kevinz000	c8435a5658	Merge pull request #8414 from Trilbyspaceclone/MASON ... New M.A.S.O.N rig	2019-06-08 01:08:00 -07:00
kevinz000	3b24e05dd6	Merge pull request #8483 from Ghommie/Ghommie-cit23 ... Ports in combat gloves plus.	2019-06-08 01:07:18 -07:00
kevinz000	61d0ac9993	Merge pull request #8476 from Trilbyspaceclone/patch-157 ... Tweaks/Buffs hierophant	2019-06-08 01:05:28 -07:00
kevinz000	68ef76e09a	Merge pull request #8432 from Ghommie/Ghommie-cit15 ... Buffs stunprods to not have a cooldown	2019-06-08 01:03:01 -07:00
kevinz000	c7f346a03c	Merge pull request #8442 from Trilbyspaceclone/patch-139 ... Makes soviet clothing no longer need to be hacked AND emaged	2019-06-08 01:02:21 -07:00
kevinz000	8c632bed6f	Merge pull request #8391 from Trilbyspaceclone/patch-132 ... Gives pod lava land ruin a autolathen	2019-06-08 01:00:41 -07:00
deathride58	1dde6b90ae	Merge pull request #8538 from dtfe3/dtfe3-hair-twintail ... Hair - Long Twintails	2019-06-08 01:37:29 -04:00
deathride58	7fcb46e0f6	Merge pull request #8468 from Citadel-Station-13/kevinz000-patch-41 ... buffs disabler 20-->25 shots firerate 2.5/s --> 3.33/s speed 412.5-->471.5 pixels/s	2019-06-08 01:09:52 -04:00
deathride58	8bf5777844	Merge pull request #8474 from Citadel-Station-13/adrenal_nerf ... Adrenal rebalancing/nerfing. Again. And a very slight meth buff.	2019-06-08 01:07:56 -04:00
deathride58	aa53cc9ea9	Merge branch 'master' into fuckatmos	2019-06-07 04:38:47 -04:00
Ghommie	56be73f7e0	Lord Travis Hath Spoken.	2019-06-07 07:44:33 +02:00
Ghommie	92e925f1f7	Stuff to fix, fools to blame.	2019-06-07 07:14:24 +02:00
Ghommie	4d5332346e	Compiling was too slow.	2019-06-07 06:37:03 +02:00
Ghommie	7aac9e6280	Updates reagents a bit.	2019-06-07 06:27:04 +02:00
Poojawa	38dbdf1a48	Gives Ninjas back their Weeb speech modification	2019-06-06 21:55:35 -05:00
Ghommie	455332a717	movin back to the core when selecting a new display.	2019-06-07 04:20:15 +02:00
Ghommie	a6fcac55d4	Makes it compile.	2019-06-07 04:05:27 +02:00
Ghommie	0b53df47de	Enough clowning around.	2019-06-07 03:22:26 +02:00
Poojawa	67eb76b360	clarifies a few things	2019-06-06 18:56:26 -05:00
Ghommie	5a69499927	Hol up, unrelated PR time, atomization.	2019-06-07 01:32:15 +02:00
Ghommie	ef7fb47e17	port fixaloo.	2019-06-07 00:41:19 +02:00
Ghommie	bdaab020f7	ports a fix.	2019-06-07 00:20:04 +02:00
Trilbyspaceclone	a7fe2ca0ff	paper work icons	2019-06-06 16:03:24 -04:00
Trilbyspaceclone	6fd83df81f	Update recipes.dm	2019-06-06 16:00:02 -04:00
Trilbyspaceclone	7f35a15020	Update packs.dm	2019-06-06 15:58:13 -04:00
Trilbyspaceclone	e2a3b855b8	Update order.dm	2019-06-06 15:56:27 -04:00
Trilbyspaceclone	4ef2b15c69	Update manifest.dm	2019-06-06 15:51:37 -04:00