519 Commits

Author	SHA1	Message	Date
Fox McCloud	153de130f4	Merge pull request #7130 from FalseIncarnate/bugfix ... Allows scythes to mass-clear glowshrooms	2017-04-26 00:10:26 -04:00
FalseIncarnate	f7c76befff	Variable rename and operator change ... Changes the variable name to avoid confusion, and changes the math to use the *= operator. Also does the same for the spacevines, for consistency.	2017-04-25 23:55:40 -04:00
FalseIncarnate	f8b5a7025e	Fixes folded tele-scythes not doing ANY damage ... I knew that return was there for a reason...	2017-04-21 16:03:04 -04:00
Crazy Lemon	327f89c890	Merge pull request #6950 from Fox-McCloud/tesla-tweaks ... Tesla Update	2017-04-21 09:52:23 -07:00
FalseIncarnate	faf0567774	Allows scythes to mass-clear glowshrooms ... Glowshrooms are no longer immune to the reaper's touch, and will be shredded by scythes just like vines.	2017-04-19 15:42:14 -04:00
Mark van Alphen	d786a78e2e	Merge branch 'master' into findnreplace	2017-04-19 20:41:05 +02:00
Crazy Lemon	18ffff09f4	Merge pull request #7026 from warior4356/Virtual-Avatars ... VR Phase #1	2017-04-18 21:25:35 -07:00
Markolie	d9653c79f5	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace ... # Conflicts: # code/game/machinery/recharger.dm # code/game/objects/items/devices/autopsy.dm # code/game/objects/items/devices/modkit.dm # code/game/objects/structures/lattice.dm	2017-04-14 18:15:12 +02:00
Fox-McCloud	5631d36ff8	Converts Most Destroys to use QDEL_NULL	2017-04-04 23:08:41 -04:00
Fox-McCloud	8fb17b2bee	moarrr	2017-04-04 04:26:53 -04:00
Fox-McCloud	9a20311152	better QDEL_NULL	2017-04-04 00:35:42 -04:00
Fox-McCloud	fb02933f30	For qdel and Destroy Fixes	2017-04-03 19:06:20 -04:00
Crazy Lemon	de8c504a19	Merge pull request #6910 from SamHPurp/spawner-map-utilities ... Adds tools for mappers	2017-04-03 01:14:16 -07:00
Warior4356	6807b8ba95	Merge remote-tracking branch 'ParadiseSS13/master' into Virtual-Avatars	2017-04-02 02:47:42 -07:00
Warior4356	dbf989be51	Phase one done.	2017-04-02 01:50:51 -07:00
Mark van Alphen	2d1c04c112	Merge branch 'master' into findnreplace	2017-04-01 23:51:58 +02:00
Crazy Lemon	9c233a676d	Merge pull request #6865 from Fox-McCloud/receiverssss ... Adds Modular Receivers to Loot Table and Hacked Autolathes	2017-03-30 18:32:32 -07:00
Fox-McCloud	c08c13689c	Merge remote-tracking branch 'upstream/master' into tesla-tweaks	2017-03-30 17:38:04 -04:00
davipatury	1673340c2d	effect/effect/foam to structure/foam	2017-03-30 10:48:16 -03:00
davipatury	8963e96c41	effect/spider to structure/spider	2017-03-27 19:01:25 -03:00
davipatury	b91fbe264e	effect/glowshroom to structure/glowshroom	2017-03-27 18:52:19 -03:00
Sam	04e6cd55bc	Adds fungus, oil, cobweb, dirt spawners	2017-03-27 22:12:13 +01:00
Fox-McCloud	ee44034138	Tesla Update	2017-03-26 17:53:55 -04:00
Mark van Alphen	cd78336ab8	Merge branch 'master' into findnreplace	2017-03-25 00:11:39 +01:00
Fox-McCloud	1933d0d597	Merge remote-tracking branch 'upstream/master' into receiverssss	2017-03-24 16:50:57 -04:00
Sam	4b9ff275b8	Adds additional mapping tools	2017-03-24 13:25:04 +00:00
Fox McCloud	b0dc4ccab2	Merge pull request #6738 from uraniummeltdown/shadowshroom ... Shadowshrooms + Glowshroom Nerf + Station Lighting Nerf	2017-03-23 12:39:36 -04:00
uraniummeltdown	0f5c0e40e2	nerf station lighting along with shadowshroom glow power, fix shroom spreading, endurance fix	2017-03-23 14:12:17 +04:00
Fox-McCloud	1a47f2111f	Adds Modular Receivers to Loot Table	2017-03-22 17:53:53 -04:00
Warior4356	ef9ad52706	Avatar code working	2017-03-20 17:34:40 -07:00
Mark van Alphen	06b3460d6e	Merge branch 'master' into findnreplace	2017-03-15 16:02:14 +01:00
Crazy Lemon	4edee61021	Merge pull request #6739 from Kyep/gateway_wildwest_mines ... Stops Wild West syndie mobs killing themselves with their own mines	2017-03-13 13:14:34 -07:00
Kyep	b6b1b3c0aa	Stops Wild West syndie mobs blowing themselves up on their own mines ... 🆑 Kyep fix: Syndicate mobs in the Wild West are no longer so stupid that they trip over, and die to, their own mines. /🆑	2017-03-11 02:11:33 -08:00
uraniummeltdown	658e0f6a82	adds shadowshrooms from tgstation, nerf glowshroom glow a bit and add new vars for glow, add new shadow and red light genes	2017-03-11 13:36:04 +04:00
uraniummeltdown	9eb7eea1e9	removes fourth argument air_group of CanPass() as it's not used and is a leftover from FEA	2017-03-10 22:46:02 +04:00
Mark van Alphen	cef5626f85	Merge branch 'master' into findnreplace	2017-03-09 17:32:42 +01:00
Markolie	acab5d5170	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz ... # Conflicts: # code/game/objects/items/weapons/storage/bags.dm # code/game/objects/items/weapons/storage/uplink_kits.dm # code/game/objects/items/weapons/storage/wallets.dm	2017-03-08 10:45:16 +01:00
Mark van Alphen	b26d50d9f9	Merge branch 'master' into findnreplace	2017-03-08 10:37:10 +01:00
Markolie	3aa1399995	Implement usesound/toolspeed	2017-03-07 16:46:28 +01:00
Fox-McCloud	41d4c83f17	Refactors Money	2017-03-06 04:52:03 -05:00
Mark van Alphen	b0ded4b821	Merge branch 'master' into findnreplace	2017-03-05 12:09:52 +00:00
Fox McCloud	8729dff99e	Merge pull request #6588 from Crazylemon64/random_barrier ... Adds a random barrier for use in mapping	2017-02-26 17:27:20 -05:00
davipatury	97b9e17955	Datacore refactor.	2017-02-25 22:31:19 -03:00
Crazylemon64	5b148e13e8	Adds a random barrier for use in mapping	2017-02-24 18:18:46 -08:00
Markolie	6982014a6e	Replace all BYOND text macros	2017-02-21 15:41:37 +01:00
Markolie	0aabf436db	Fix ion trail effect	2017-02-11 20:33:26 +01:00
Fox McCloud	04f5276047	Merge pull request #6350 from Markolie/lavaland_updates ... Add remaining Lavaland loot, kinetic accelerator refactor	2017-02-11 00:02:42 -05:00
Fox-McCloud	0ebd41b05e	Fixes Slaughter Demon Bloodcrawl	2017-02-10 08:26:28 -05:00
Markolie	3298f7edce	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates ... # Conflicts: # icons/obj/objects.dmi	2017-02-08 19:25:47 +01:00
Fox-McCloud	dc15825102	Fixes Xeno Eggs and Projectiles	2017-02-07 07:27:43 -05:00