24322 Commits

Author	SHA1	Message	Date
uraniummeltdown	bbe7663e21	fixed enter_link	2017-02-06 20:22:08 +04:00
uraniummeltdown	cd865ac1f2	revert immovable rod announcement change	2017-02-06 18:56:23 +04:00
uraniummeltdown	332deb840e	Merge remote-tracking branch 'remotes/upstream/master' into events ... # Conflicts: # code/modules/events/immovable_rod.dm	2017-02-05 14:04:45 +04:00
Crazy Lemon	01c41cfb86	Merge pull request #6081 from Markolie/lavaland_megafauna ... Ports Lavaland megafauna	2017-02-05 00:27:40 -08:00
Fox McCloud	baab43b840	Merge pull request #6332 from uraniummeltdown/cargoid ... Cargonia ID skin for agent ID and ID Computer	2017-02-05 00:47:32 -05:00
Fox McCloud	bf38e4a719	Merge pull request #6325 from Aurorablade/Unholywater ... Unholy water fix	2017-02-05 00:22:04 -05:00
uraniummeltdown	7dd342743a	added cargo ID skin to agent ID and ID Computer	2017-02-05 09:19:52 +04:00
Aurorablade	1943f059c5	Requested changes	2017-02-03 23:41:04 -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
Aurorablade	391976f7ed	I thought i deleted you....	2017-02-03 17:14:44 -05:00
Aurorablade	37573a4339	Bugfix	2017-02-03 17:05:37 -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
Fox McCloud	29d73519fc	Merge pull request #6284 from Kyep/summon_protect ... Adds check to narsie/eldergod summoning, as slaughter summoning already has	2017-02-02 00:49:49 -05:00
Chakirski	f39fe8ab75	muh future	2017-02-01 21:29:04 -06:00
Fox McCloud	cd4acc5db8	Merge pull request #6307 from Markolie/fixxxxx ... Fix security record time and mecha attackby cooldown	2017-02-01 21:58:32 -05:00
Markolie	1a44f3b3d4	Add attack animation to mecha attackby	2017-02-01 18:47:10 +01:00
Markolie	d83c28fb54	Removes year from security computer	2017-02-01 18:44:21 +01:00
Markolie	2716083dc3	Fix security record time and mecha attackby cooldown	2017-02-01 18:39:36 +01: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
Kyep	ce2a75f9da	Deletes copypaste, including already-existing copypaste	2017-01-30 22:50:40 -08:00
Fox McCloud	0874ea7295	Merge pull request #6152 from uraniummeltdown/windowflash ... Window Flashing	2017-01-31 01:30:39 -05:00
Fox McCloud	c9b4a951ae	Merge pull request #6178 from FalseIncarnate/NTPS ... NTPS: Requests Console Based Shipping	2017-01-31 01:26:21 -05:00
Crazy Lemon	d76df747c5	Merge pull request #6272 from Markolie/fixxxxx ... Give brains Galactic Common language	2017-01-30 22:02:34 -08:00
Crazy Lemon	dcc3df2118	Merge pull request #6278 from tigercat2000/saycodefix ... Add slot_collar, remove simple_animal add_inv/remove_inv	2017-01-30 22:01:27 -08:00
Crazy Lemon	e7e22f5dff	Merge pull request #6273 from Kyep/names_fix ... Fixes some mobs being invisible in Check_antagonists	2017-01-30 21:59:33 -08:00
Crazy Lemon	154e08bf10	Merge pull request #6282 from Kyep/ca_initial_xenos ... Fixes initial Xenomorphs not appearing in Check Antagonists	2017-01-30 21:56:09 -08:00
Crazy Lemon	88e05849a9	Merge pull request #6242 from Aurorablade/MiddleFinger ... Bugsie:Stupid Rune Edition	2017-01-30 21:54:05 -08:00
Fox McCloud	0283e75fe5	Merge pull request #6254 from FlattestGuitar/erifle ... Adds a laser carbine!	2017-01-31 00:43:15 -05:00
Fox McCloud	323bb9f299	Merge pull request #6281 from Kyep/cc_idconsole ... Loosens restrictions on CC ID computer	2017-01-31 00:26:22 -05:00
Fox McCloud	4842d77882	Merge pull request #6239 from Ar3nn/cluwnescanbreathetoo ... Cluwne Mask now allows internals usage	2017-01-30 23:46:42 -05:00
Kyep	5d60925555	Adds check to narsie/eldergod summoning, as slaughter summoning already has	2017-01-30 03:33:13 -08:00
Fox-McCloud	ab6fffa4dc	Removes Oudated GC Info	2017-01-30 03:01:29 -05:00
Kyep	fe65d6827d	No blacklist for admins	2017-01-29 21:37:48 -08:00
Kyep	6d6eec5934	Fixes initial Xenomorphs not appearing in Check Antagonists	2017-01-29 18:48:51 -08:00
Kyep	f0005ea578	Also allows CC to modify job slots for cyborg, blueshield, NT rep, chaplain	2017-01-29 18:17:53 -08:00
Kyep	146e79a48e	Removes cooldown from CC ID computer	2017-01-29 18:03:23 -08:00
Tigercat2000	4e56bb9636	Add slot_collar, remove simple_animal add_inv/remove_inv ... This is being done to remove the simple_animal/Topic() override.	2017-01-29 13:26:54 -08:00
Chakirski	bf4e605700	removes_parent_call	2017-01-29 12:51:04 -06:00
Fox McCloud	2fc2b85079	Merge pull request #6259 from uraniummeltdown/clicc ... Make Boxes Great Again	2017-01-29 06:20:31 -05:00
Kyep	46f409ddfb	Fixes some mobs being invisible in Check_antagonists	2017-01-28 15:25:20 -08:00
Markolie	d65cc380fa	Give brains Galactic Common language	2017-01-29 00:06:00 +01:00
Crazy Lemon	d7ae5c4a7e	Merge pull request #6266 from Fox-McCloud/pill-fix ... Fixes Dental Pill being an internal organ	2017-01-28 01:40:26 -08:00
Fox McCloud	e1e0824418	Merge pull request #6202 from uraniummeltdown/xenobio ... Slime Transference Potion	2017-01-27 20:18:19 -05:00
Fox-McCloud	b24be686d0	Fixes Dental Pill being an internal organ	2017-01-27 20:02:06 -05:00