12806 Commits

Author	SHA1	Message	Date
tkdrg	e5941a59a2	Merge pull request #14124 from KorPhaeron/darkness ... Advanced Darkness (wizard event)	2016-01-01 00:51:55 -03:00
tkdrg	048480decc	Merge pull request #14096 from KorPhaeron/lancer ... Fixes successive generations of grey tide clones not despawning	2016-01-01 00:50:42 -03:00
KorPhaeron	b9bf6ef547	Advanced Darkness	2015-12-31 19:32:02 -06:00
tkdrg	8b4ce26d12	Merge pull request #14182 from Incoming5643/Men_in_tights ... Removes gender restrictions from socks	2015-12-31 22:09:35 -03:00
Cheridan	cb27e966eb	Merge pull request #14144 from TheRealGLH/electric_chair ... Containment fields and electric chairs now use electrocute_act	2015-12-31 19:01:52 -06:00
KorPhaeron	2b129fb2ea	Multiply chance down	2015-12-31 18:55:31 -06:00
tkdrg	b8ce135a34	Merge pull request #14178 from bgobandit/bucklingmessages ... Fixes extra messages while grabbing someone who is buckled.	2015-12-31 21:28:51 -03:00
tkdrg	82c53c4474	Merge pull request #14171 from AnturK/bang ... Simple mob fixes	2015-12-31 18:40:42 -03:00
tkdrg	12fe71606f	Merge pull request #14155 from optimumtact/patch-4 ... Add cockroach guts to cleanbot target list	2015-12-31 17:42:23 -03:00
tkdrg	52a45b6292	Merge pull request #12935 from AndrewJacksonThe2nd/objectives_rework ... OBJECTIVES REWORK: Better Objectives Generation	2015-12-31 03:11:41 -03:00
tkdrg	da97c0fb58	Merge pull request #14107 from LanCartwright/newvirogrenades ... Viro-terror grenade renovation	2015-12-31 00:04:38 -03:00
tkdrg	4485cc3dfb	Merge pull request #14146 from KorPhaeron/guns ... Lesser Summon Guns	2015-12-30 23:32:13 -03:00
tkdrg	50f6b7b8c0	Merge pull request #14154 from KorPhaeron/telsa ... Removes excess tesla balls from orbit list	2015-12-30 23:27:58 -03:00
KorPhaeron	ff5767d785	Nevermind	2015-12-30 20:12:40 -06:00
KorPhaeron	504926883f	Cleans up code	2015-12-30 20:10:15 -06:00
Incoming	84fc69d825	Removes gender restrictions from socks.	2015-12-30 20:53:40 -05:00
KorPhaeron	9499d35c6b	Diety name	2015-12-30 19:39:35 -06:00
tkdrg	51a28ab055	Merge pull request #14159 from somnium13/fix-in-prec ... Fixes 'in' operator precedence issues.	2015-12-30 22:38:13 -03:00
tkdrg	213cebe1d6	Merge pull request #14153 from KorPhaeron/capsule ... Fixes bluespace shelters destroying shuttles	2015-12-30 22:36:48 -03:00
KorPhaeron	79e5f3d37e	Check that actually works	2015-12-30 19:10:49 -06:00
bgobandit	470fcbc58f	Fixes messages for grabbing someone who is buckled in.	2015-12-30 19:17:51 -05:00
WJohn	7e2daf6c23	Merge pull request #14156 from Anonus/newbooks ... Replaces every single book sprite with better sprites	2015-12-30 18:31:31 -05:00
duncathan salt	f09025abf9	Merge pull request #13983 from PKPenguin321/arm-mods ... Adds Arm-Mods (Mounted Taser & Mounted Laser)	2015-12-30 23:37:01 +01:00
tkdrg	f58c4bf635	Merge pull request #14127 from AnturK/pickups ... Adds a few special mines/pickups	2015-12-30 18:52:42 -03:00
AnturK	b875ab18cf	Makes simple mob drift properly	2015-12-30 22:31:51 +01:00
tkdrg	44a0a1b079	Merge pull request #14152 from KorPhaeron/lizards ... Fixes lizard hats being uncraftable	2015-12-30 18:12:24 -03:00
tkdrg	e681243c44	Merge pull request #14151 from SouDescolado/patch-1 ... Add telescopic baton item to detective trenchcoat	2015-12-30 18:12:09 -03:00
tkdrg	f04936251a	Merge pull request #14149 from SouDescolado/patch-2 ... Add telescopic baton item to detective armor	2015-12-30 18:10:20 -03:00
AnturK	06946ca53c	Adds timeout to player hivelord brood spawning.	2015-12-30 21:46:54 +01:00
KorPhaeron	e0157185fc	Blacklist	2015-12-30 10:10:54 -06:00
TheRealGLH	9cb962cbc1	removes argument that did not need to be specified	2015-12-30 09:34:42 +01:00
tkdrg	e57b43276d	Merge pull request #14134 from GunHog/In_This_Episode_Gun_Hog_Teaches_MATH! ... Fixes Abductor event	2015-12-29 22:51:17 -03:00
Melichior	53db2cbcd1	Fixed 'in' precedence errors.	2015-12-29 17:16:09 -07:00
Razharas	fd0738aff8	Merge pull request #14125 from KorPhaeron/gold_grub ... Gold grub fix	2015-12-30 00:38:06 +03:00
Cheridan	a40b732fe4	Merge pull request #13943 from tkdrg/abos ... Checking antagonists will now message admins	2015-12-29 15:02:00 -06:00
Nerd Lord	7c8a138f60	Sneaks in a new book sprite that's totally white colored, no blue dot.	2015-12-29 16:01:14 -05:00
PKPenguin321	bdaf037434	fixes the force values and removes ".0"s ... thanks @jordie0608 pls let this be ready for merge	2015-12-29 12:07:50 -08:00
oranges	06338ecd3d	Add cockroach guts to cleanbot target list ... whitelists are such a meme	2015-12-30 08:58:27 +13:00
duncathan salt	42d10a22d3	Merge pull request #13926 from Bawhoppen/czechmilitary ... Tactical Gear + small changes	2015-12-29 20:43:14 +01:00
SouDescolado	548549409b	Update jobs.dm ... /obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic	2015-12-29 17:27:17 -02:00
SouDescolado	16f754502a	Update armor.dm ... /obj/item/weapon/melee/classic_baton/telescopic instead of /obj/item/weapon/classic_baton/telescopic	2015-12-29 17:26:14 -02:00
KorPhaeron	034842b901	Fixes tesla	2015-12-29 13:16:33 -06:00
KorPhaeron	9148b9ccd2	Bluespace shelter	2015-12-29 13:08:29 -06:00
KorPhaeron	4bdf1a882b	Lizard hats	2015-12-29 13:01:13 -06:00
SouDescolado	c38ca9fc92	Add telescopic baton item to detective armor ... Add telescopic baton item to detective armor	2015-12-29 16:17:56 -02:00
SouDescolado	ed6f41f6de	Add telescopic baton item to detective trenchcoat ... Add telescopic baton item to detective trenchcoat	2015-12-29 16:16:13 -02:00
tkdrg	5930ee0d66	Merge pull request #13588 from Lo6a4evskiy/quick-equip-refactor ... Refactor quick-equip verb	2015-12-29 14:26:48 -03:00
KorPhaeron	9bcca100ca	Lesser Summon Guns	2015-12-29 10:58:27 -06:00
Lo6a4evskiy	6080a8fa96	Fix buckets with liquid not quick equipping	2015-12-29 18:20:42 +04:00
Lo6a4evskiy	ab6fb1ab36	Refactor using slot_equipment_priority	2015-12-29 17:59:56 +04:00