6365 Commits

Author	SHA1	Message	Date
Crazy Lemon	67f72b2791	Merge pull request #7109 from Lady-Luck/syndibundles ... Syndicate Bundle Adjustments	2017-04-21 09:25:38 -07: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
Krausus	4572ad6af4	Fixes matchboxes lacking storage limitations	2017-04-16 22:53:03 -04:00
Fox McCloud	84885f1efa	Merge pull request #7007 from uraniummeltdown/glass ... Heat Proofing Glass Airlocks	2017-04-16 17:55:10 -04:00
Lady-Luck	b9274b6654	Reverts removal of the uplink implant to the implant bundle, instead just removes EMP and Microbomb.	2017-04-16 14:57:31 -05:00
Lady-Luck	e767fdab8a	Changes the two red energy swords into a red double-bladed energy sword (reverted from commit 46d4c5b9c7)	2017-04-15 17:05:22 -05:00
Lady-Luck	46d4c5b9c7	Changes the two red energy swords into a red double-bladed energy sword	2017-04-15 16:19:01 -05:00
Lady-Luck	0d1179a54a	Adjusts syndicate bundles, adds Allies Cocktail object for bond bundle	2017-04-15 16:01:09 -05:00
FlattestGuitar	8978f1e530	Fluffpocalypse	2017-04-15 22:05:15 +02: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	e9156ef71b	Merge pull request #7036 from FlattestGuitar/desolate-fluff ... Adds a fluff item for DesolateG 👌	2017-04-11 19:52:14 -04:00
Fox McCloud	0edc5400b3	Merge pull request #7080 from SamHPurp/loyalty-to-mindshield ... Refactors any remaining Loyalty references to Mindshield	2017-04-11 19:50:59 -04:00
FlattestGuitar	c73eb10c1b	Adds a fluff item for DesolateG	2017-04-12 00:41:20 +02:00
Sam	e291a7ec6f	Fixes 7082	2017-04-10 01:10:20 +01:00
Crazy Lemon	ff271f7b29	Merge pull request #7061 from Fox-McCloud/damn-cells ... Damn cells	2017-04-09 13:55:30 -07:00
Crazy Lemon	cc649db525	Merge pull request #6894 from Fox-McCloud/abductor-hearts ... Abductor Gland Rework and Abductor Updates	2017-04-09 13:40:01 -07:00
Sam	932cae0224	Loyalty implant -> Mindshield Implant	2017-04-09 16:50:51 +01:00
Fox-McCloud	d07f49433a	oh, this is what you meant....	2017-04-06 06:38:28 -04:00
Fox-McCloud	ec223e040e	fixes	2017-04-06 06:37:18 -04:00
Crazy Lemon	23180656c0	Merge pull request #7050 from Fox-McCloud/autopsy-fix ... Fixes+Refactors Autopsy Scanner Printing	2017-04-06 00:04:28 -07:00
Crazy Lemon	f9ee33a797	Merge pull request #7054 from Fox-McCloud/destroy-qdelnull ... Converts Most Destroys to use QDEL_NULL	2017-04-05 23:49:19 -07:00
Fox-McCloud	ab5cab5af7	tweak	2017-04-05 23:46:53 -04:00
Fox McCloud	4ad7cd17fd	Merge pull request #7043 from SamHPurp/assorted-fixes ... Fixes	2017-04-05 19:15:12 -04:00
Fox McCloud	61eff3aa1f	Merge pull request #7051 from SamHPurp/light-cigs-with-fireballs ... Enables lighting cigarettes with Wands of Fireball	2017-04-05 19:11:34 -04:00
Fox-McCloud	5631d36ff8	Converts Most Destroys to use QDEL_NULL	2017-04-04 23:08:41 -04:00
Sam	4fc96b7d21	Wizards always succeed ... By request of Fox.	2017-04-05 00:59:04 +01:00
Sam	89f10e834c	boom	2017-04-04 23:46:55 +01:00
Fox-McCloud	2205c14b7d	Fixes+Refactors Autopsy Scanner Printing	2017-04-04 18:13:35 -04:00
Sam	88ec05be4e	Couple typos and a gramatically tweak	2017-04-04 14:27:22 +01: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
Crazy Lemon	c6abe7822b	Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs ... Garbage Collection and Code Cleanup	2017-04-01 22:58:52 -07:00
Fox-McCloud	35ab7ada94	Refactors Cell Energy Values	2017-04-01 20:14:29 -04:00
Mark van Alphen	2d1c04c112	Merge branch 'master' into findnreplace	2017-04-01 23:51:58 +02:00
Fox McCloud	f83b48f26a	Merge pull request #6997 from Crazylemon64/ghostbeacon_rerouting ... Allows rerouting of ghost beacons	2017-04-01 17:46:22 -04:00
Fox McCloud	7668c79e7c	Merge pull request #7006 from KasparoVy/windowner ... Window Corridor Thrown Objects Fix	2017-04-01 17:39:28 -04:00
Fox-McCloud	5c24029a8a	baton	2017-04-01 08:40:03 -04:00
uraniummeltdown	2f54ed86a2	airlock assemblies can be heatproofed by adding rglass during construction, blast/pod doors + shutters have heat_proof = 1	2017-03-31 16:13:25 +04:00
KasparoVy	3aa4cefad8	Window Corridor Thrown Objects Fix ... Thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.	2017-03-31 04:50:56 -04:00
Crazy Lemon	8cf82bcb7a	Merge pull request #6937 from Fox-McCloud/autopsy ... Autopsies No Longer Need Surgery	2017-03-30 18:36:21 -07: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	f821749086	Merge pull request #6777 from uraniummeltdown/tesla ... Tesla Grilles	2017-03-30 21:24:21 -04:00
davipatury	1673340c2d	effect/effect/foam to structure/foam	2017-03-30 10:48:16 -03:00
Crazylemon64	2165d5db6f	Allows rerouting of ghost beacons	2017-03-30 03:16:06 -07:00
Fox-McCloud	50051ee851	Garbage Collection and Code Cleanup	2017-03-27 18:37:44 -04:00