11301 Commits

Author	SHA1	Message	Date
Fox McCloud	0b5875992b	Merge pull request #2538 from Crazylemon64/miner_announce ... Additional Requests Console Functionality	2015-11-15 08:17:20 -05:00
TheDZD	ff8e86024a	Merge pull request #2529 from Fox-McCloud/baby-carp ... Allows you to Gut Baby Carp	2015-11-14 18:26:37 -05:00
TheDZD	64533c3c56	Merge pull request #2535 from Fox-McCloud/snacks ... Snacks	2015-11-14 18:25:05 -05:00
Fox-McCloud	2bc2b1958d	refactor	2015-11-14 18:21:45 -05:00
Crazylemon64	1b4a39eb24	MULEbots notify on relevant deliveries ... Also: -Adds more request consoles throughout the map - Atmospherics, Brig Medbay, Warden, Security	2015-11-14 14:29:24 -08:00
TheDZD	86f22c0f76	Merge pull request #2531 from Tastyfish/master ... Fixed the lighting when placing floor plating.	2015-11-14 14:28:48 -05:00
Tigercat2000	9101157b1b	Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ... Conflicts: code/modules/mob/living/carbon/human/species/species.dm	2015-11-14 07:01:36 -08:00
TheDZD	dfde703d50	Merge pull request #2536 from Fox-McCloud/stamina-fix ... Fixes Stamina	2015-11-14 09:29:10 -05:00
Crazylemon64	da37bbeb6a	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into miner_announce	2015-11-13 21:56:32 -08:00
tigercat2000	e4d4bfc899	why humans why	2015-11-13 20:55:24 -08:00
Tigercat2000	27a011e44f	fix stunned shit	2015-11-13 20:47:18 -08:00
Fox-McCloud	fc9aff7128	Fixes Stamina	2015-11-13 23:15:36 -05:00
Fox-McCloud	c08959423c	Snacks	2015-11-13 17:16:47 -05:00
Tigercat2000	0bb6f36e4a	Fixes medhud/sechud/etc shit, ai life refactor ... Dear god please nuke AI code from the face of this earth.	2015-11-13 07:28:45 -08:00
Crazylemon	5636d721b0	Initial test of tg-esque mineral reclaimer announcements	2015-11-12 22:32:43 -08:00
Tastyfish	e5fe114e24	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise	2015-11-12 22:42:51 -05:00
Tastyfish	3f264936a1	Make placing floor plating on space actually update lighting correctly	2015-11-12 22:42:16 -05:00
TheDZD	213a8aeedd	Merge pull request #2520 from Fox-McCloud/recipe-fix ... Recipe Fix	2015-11-12 22:24:37 -05:00
Fox-McCloud	d150545f74	Allows you to Gut Baby Carp	2015-11-12 21:27:42 -05:00
Tigercat2000	9e5e81325e	Fix Vision code weirdness	2015-11-12 17:47:33 -08:00
Tigercat2000	056585399b	Fix carbon/Life() ... yeah whoops APPARENTLY BAY HAD LIVING/LIFE() AND CARBON/LIFE() damnit bay	2015-11-12 16:53:41 -08:00
Fox-McCloud	a123b10572	Recipe Fix	2015-11-11 22:27:40 -05:00
Tigercat2000	2c5201614e	Robustify Floortile launcher ... Whoops, left it using /obj/item/stack/tile, which are debug items. Also, spelling.	2015-11-11 18:07:25 -08:00
Tigercat2000	9186d94ba1	Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ... Conflicts: icons/mob/suit.dmi	2015-11-11 16:51:44 -08:00
TheDZD	b72280c2e2	Merge pull request #2512 from Fox-McCloud/pneumatic-cannon ... Ports TG Pneumatic Cannon	2015-11-11 09:52:16 -05:00
TheDZD	3f51bd5715	Merge pull request #2513 from Fox-McCloud/adminbus ... Adminbus Items	2015-11-11 09:52:06 -05:00
TheDZD	0e94e359f1	Merge pull request #2506 from Fox-McCloud/kitchen-changes ... Kitchen Updates	2015-11-10 19:35:29 -05:00
Fox McCloud	2e5224f0c9	Merge pull request #2510 from Tastyfish/master ... Fixed problems with media machines (ie jukebox)	2015-11-10 19:26:06 -05:00
Fox-McCloud	5f87575cf6	proper destroy	2015-11-10 04:25:57 -05:00
Fox-McCloud	c9da7b5d7c	Adminbus Items	2015-11-10 04:21:21 -05:00
Fox-McCloud	bfac0b62fa	Ports TG Pneumatic Cannon	2015-11-09 22:54:05 -05:00
TheDZD	53ec59a7fe	Merge pull request #2504 from Fox-McCloud/decloner-tweak ... Decloner Tweak	2015-11-09 22:02:15 -05:00
Tastyfish	bc8627254c	Fixed Setting volume for media machines, as well as them updating for mobs in room	2015-11-09 21:57:24 -05:00
Fox McCloud	4325daaabc	Merge pull request #2497 from tigercat2000/html5_stuff ... HTML5, IE11, CSS3	2015-11-09 20:59:14 -05:00
Fox-McCloud	ab3ed53734	Kitchen Updates	2015-11-09 01:09:59 -05:00
Fox-McCloud	43930aba4a	Decloner Tweak	2015-11-08 21:45:34 -05:00
Fox-McCloud	9237fdd1ab	Food Recipe Changes	2015-11-08 20:28:43 -05:00
DZD	22c53438b9	Fixes broken hunter pounce caused by armor change.	2015-11-08 14:23:20 -05:00
Tigercat2000	29f42f8b61	Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark ... Conflicts: code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/life.dm code/modules/mob/living/silicon/pai/life.dm	2015-11-07 20:54:24 -08:00
Fox McCloud	cc6dcd72bb	Merge pull request #2468 from tigercat2000/tg-life ... -tg- Life() refactors	2015-11-07 23:08:01 -05:00
Tigercat2000	e56f29ed88	Why do I sabotage myself? Standardizes virus2 creator, fixes wrong state.	2015-11-07 19:32:57 -08:00
TheDZD	ac68049fec	Merge pull request #2490 from Fox-McCloud/stripping ... Adds Custom Strip Delays	2015-11-07 22:31:17 -05:00
Tigercat2000	77cdaedb42	Merge remote-tracking branch 'upstream/master' into html5_stuff	2015-11-07 19:20:45 -08:00
Fox McCloud	d7a06fc238	Merge pull request #2487 from TheDZD/ayyliens ... Makes xenomorph stuns factor in melee armor	2015-11-07 22:19:33 -05:00
Fox McCloud	ed7de9ebec	Merge pull request #2483 from tigercat2000/virus2_is_a_little_less_trash ... Admin Virus2 Creator	2015-11-07 22:19:14 -05:00
Tigercat2000	ee8ef3588f	not ideal but species deffault stuff yeah	2015-11-07 19:11:22 -08:00
Tigercat2000	9e69c55229	Fix occupations menu formatting	2015-11-07 09:47:52 -08:00
Tigercat2000	4e6397ffec	Fix Major UI updating issues, jQuery changes, debug hooks. ... Also fixes incredibly fucked-up air alarm template and CSS.	2015-11-07 09:46:43 -08:00
Fox-McCloud	a32b31d9b4	Adds Custom Strip Delays	2015-11-06 22:34:55 -05:00
TheDZD	6deffa0535	Merge pull request #2489 from Fox-McCloud/circuit-board-pathing ... Circuit Board Repathing and Swarmer Fixes	2015-11-06 21:51:39 -05:00