6094 Commits

Author	SHA1	Message	Date
Crazy Lemon	23a43f141e	Merge pull request #6329 from uraniummeltdown/mineral ... Mineral Floors	2017-02-07 19:33:24 -08:00
Crazy Lemon	7561459cb5	Merge pull request #6296 from KasparoVy/steal-storageimp-check ... Traitor Steal Objective now Checks Storage Implants	2017-02-07 10:05:44 -08:00
Crazy Lemon	c0ce60cc76	Merge pull request #6356 from Fox-McCloud/fixes-xeno-eggs ... Fixes Xeno Eggs and Projectiles	2017-02-07 09:55:47 -08:00
Fox McCloud	6b10c515b1	Merge pull request #6341 from uraniummeltdown/crates ... Engineering and Science crates	2017-02-07 09:20:57 -05:00
Fox-McCloud	dc15825102	Fixes Xeno Eggs and Projectiles	2017-02-07 07:27:43 -05:00
uraniummeltdown	3e7dafe21a	move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state	2017-02-06 21:41:39 +04:00
Crazy Lemon	cc2eceb0a3	Merge pull request #6186 from Fox-McCloud/stunprod ... Tweaks the Stunprod	2017-02-06 05:46:26 -08:00
Fox McCloud	cd86cc5817	Merge pull request #6348 from Kyep/minefix ... Prevents mines detonating when touched by ghosts	2017-02-06 07:28:03 -05:00
Kyep	5d35de452a	Fixes conflict (rebase)	2017-02-06 04:09:15 -08:00
Kyep	b7590355b7	Fixes mines detonating when ghosts pass over them	2017-02-06 04:01:03 -08:00
Fox-McCloud	249cd3279c	Merge remote-tracking branch 'upstream/master' into stunprod	2017-02-06 05:35:59 -05:00
uraniummeltdown	6f774c8e1e	added engi+engisec, electric engi from TG and sci+scisec crates from /vg/	2017-02-05 19:22:07 +04:00
uraniummeltdown	385db6d240	Merge remote-tracking branch 'remotes/upstream/master' into mineral ... # Conflicts: # icons/obj/items.dmi # icons/turf/floors.dmi	2017-02-05 17:40:39 +04:00
Fox-McCloud	2c986259af	Fixes Iconless Banana Peels	2017-02-05 06:43:14 -05:00
Fox-McCloud	390f6768b3	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-02-05 05:26:46 -05:00
Crazy Lemon	01c41cfb86	Merge pull request #6081 from Markolie/lavaland_megafauna ... Ports Lavaland megafauna	2017-02-05 00:27:40 -08:00
uraniummeltdown	5f2ef0ef7d	mineral floors from TG ... group silent tiles with mineral tiles add tile recipes add mineral floor tile stacks and turfs add ability to weld mineral floor tiles	2017-02-05 10:46:24 +04:00
uraniummeltdown	7dd342743a	added cargo ID skin to agent ID and ID Computer	2017-02-05 09:19:52 +04:00
Fox-McCloud	f8602ffef8	last fixes, hopefully	2017-02-04 04:28:42 -05:00
Fox McCloud	917fb17e16	Merge pull request #6315 from DrunkDwarf/mrchangs-tweak ... Tweak: Mr Chang's vending machine now refillable	2017-02-03 21:33:23 -05:00
Mark van Alphen	fe62b212b4	Merge branch 'master' into lavaland_megafauna	2017-02-02 20:17:31 +01:00
Fox McCloud	c7bb9fd91a	Merge pull request #6301 from Alexshreds/bugaroo ... Deconstructing Closets Yields Proper Amount of Metal	2017-02-02 11:07:54 -05:00
Brian McGillivray	23139987a0	Tweak: Mr Chang's vending machine now refillable ... Changed the Mr Chang's vending machine to be able to be refiled with a new Chinese vending refill canister crate that can be ordered by Cargo.	2017-02-02 15:49:27 +00:00
Fox McCloud	3d587dea5b	Merge pull request #6177 from uraniummeltdown/new ... Cyborg Blueprints	2017-02-02 00:50:33 -05:00
Chakirski	f39fe8ab75	muh future	2017-02-01 21:29:04 -06:00
Chakirski	812c2db2fe	closets	2017-01-31 19:14:31 -06:00
Markolie	b55394ace3	Fix resource identifiers	2017-01-31 17:45:46 +01:00
Markolie	2b767bb9c9	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/modules/mob/mob_helpers.dm # icons/obj/ammo.dmi # icons/obj/guns/projectile.dmi # icons/obj/storage.dmi	2017-01-31 17:44:38 +01:00
uraniummeltdown	7259e4ce07	blueprints for engiborgs	2017-01-31 19:22:29 +04:00
KasparoVy	4a9f7f28f7	Traitor Steal Objective now Checks Storage Implants ... Does what it says on the tin. In assessing the completion of a steal objective, storage implants will now be checked.	2017-01-31 05:01:23 -05:00
Fox McCloud	0874ea7295	Merge pull request #6152 from uraniummeltdown/windowflash ... Window Flashing	2017-01-31 01:30:39 -05:00
Fox-McCloud	80587202fe	forcemove fixes	2017-01-27 21:03:57 -05:00
Fox-McCloud	6fb69e272c	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-27 20:15:25 -05:00
Crazy Lemon	cd31694e12	Merge pull request #6253 from fludd12/GhostBar ... Respawner Machine (Attempt Deux)	2017-01-27 16:59:36 -08:00
Fox-McCloud	9fd8718bc7	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-27 19:31:07 -05:00
Markolie	ab4703623c	Review changes	2017-01-27 17:46:38 +01:00
Markolie	1d7de41acb	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna ... # Conflicts: # code/modules/pooling/pool.dm	2017-01-27 17:28:14 +01:00
Fox-McCloud	6d3ef6001f	drying racks	2017-01-26 23:48:47 -05:00
Fox McCloud	a1ac4a9ec2	Merge pull request #6231 from Aurorablade/ThePowerOfSalt ... THE POWER OF SALT COMPELS YOU	2017-01-26 10:52:44 -05:00
Aurorablade	55e58ef471	honk	2017-01-26 10:39:48 -05:00
fludd12	bb263d58c5	#JustAdminThings	2017-01-26 09:23:49 -05:00
Fox-McCloud	51bbe8c466	Merge remote-tracking branch 'upstream/master' into botany-rework	2017-01-26 06:53:18 -05:00
Crazy Lemon	0e42e416b6	Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor ... Makes Reagents Holder Process and Refactors NOREACT	2017-01-26 03:47:30 -08:00
fludd12	3cff59ec74	Adds Respawner	2017-01-26 05:09:44 -05:00
Mark van Alphen	d55a2c4b6e	Merge branch 'master' into lavaland_megafauna	2017-01-25 18:56:09 +01:00
Crazy Lemon	15dca8b4aa	Merge pull request #6226 from Fox-McCloud/debug-this ... Removes Unused Object	2017-01-25 04:15:18 -08:00
Fox-McCloud	084ed30446	more fixes and features	2017-01-25 01:04:01 -05:00
Aurorablade	29c6a89f45	removes processed bread	2017-01-24 23:24:49 -05:00
Fox-McCloud	36bfee25dc	last of the missing stuff, hopefully	2017-01-24 18:33:22 -05:00
Fox-McCloud	b1f789e104	fixes a ton of thing	2017-01-24 03:23:16 -05:00