8469 Commits

Author	SHA1	Message	Date
Cheridan	0cdffeecfb	Merge pull request #8296 from phil235/TablecraftFix ... Tablecraft Fix and recipe detection	2015-03-14 19:41:56 -05:00
phil235	0232afd05d	Fix typo in catalyst. ... Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter). Fix lack of message when trying to turn on an unsecured welding tool. Fix lack of icon update when clicking plasma tank with empty flamethrower.	2015-03-15 00:23:47 +01:00
Cheridan	1027c7619c	Merge pull request #8206 from RemieRichards/AILessProcessing ... Hostile Mob AI Optimisation	2015-03-14 16:21:22 -05:00
Cheridan	52dfa42eb5	Merge pull request #8257 from phil235/ReflectFix ... Simplifies laser reflection code	2015-03-14 16:15:52 -05:00
Cheridan	f70084ecab	Merge pull request #8227 from phil235/HulkCritFix ... Hulk crit fixes	2015-03-13 22:56:51 -05:00
Cheridan	ecb3a4e08f	Merge pull request #8236 from phil235/DoughChange ... Dough change	2015-03-13 15:34:39 -05:00
Cheridan	e5428c1519	Merge pull request #8256 from phil235/StrangenessTextFix ... Strangeness text, janicart, alien nest, weak golem fixes	2015-03-13 15:23:30 -05:00
Cheridan	9c3ed3da04	Merge pull request #8247 from Incoming5643/Welcome_to_ireland ... Explicitly passes a mobs mutant_color in blood samples	2015-03-13 15:22:14 -05:00
Cheridan	6e26db3783	Merge pull request #8288 from Ahammer18/Sensors ... Toggle/Adjust suit sensors	2015-03-13 14:45:08 -05:00
hornygranny	875313be9e	Merge pull request #8279 from MrPerson/pull_rapidemente_ariba_ariba_vamanos ... Pulling icon en-speedening	2015-03-13 12:22:17 -07:00
MrPerson	e7ba8df654	Moved all pull icon updating to update_icon(), to reduce copy+paste. ... Made the pull icon update_icon() as part of creation as requested by oranges.	2015-03-13 12:10:13 -07:00
Cheridan	12f5f6ae20	Merge pull request #8290 from Ahammer18/droneassfinal ... Drone asses!	2015-03-13 13:57:43 -05:00
Cheridan	24b2d03e0f	Merge pull request #8283 from Miauw62/taserdelayymao ... Reduces the taser firing delay.	2015-03-13 12:58:24 -05:00
Cheridan	7e011680ec	Merge pull request #8237 from GunHog/CherryFlavoredPins ... Loyalty Implant Firing Pins	2015-03-13 12:57:28 -05:00
GunHog	1f400f6860	Increases requirements ... Reqs to make it are now Combat 6, Mats 6, Power 3.	2015-03-13 12:15:49 -05:00
phil235	27cfbdcb2a	Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car ... Fixes cavity implant surgery not respecting NODROP	2015-03-13 12:23:44 +01:00
phil235	8248baee67	Merge pull request #8230 from norill/master ... fixed improper req_tech "power" -> "powerstorage"	2015-03-13 12:16:06 +01:00
phil235	b3d9c9ca43	Merge pull request #8232 from Iamgoofball/patch-43 ... Cyborgs no longer have flesh to knit.	2015-03-13 12:12:39 +01:00
Cheridan	28f6aae00c	Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup ... Conflicts: icons/mob/back.dmi remie is a nerd btw	2015-03-12 20:47:11 -05:00
phil235	82d9761f1f	Fixes notasandwich and flamethrower tablecraft recipes ... Add a recipe detection to tablecrafting, if you have some of the things required for the recipe (50% of the amount of different things needed, i.e if less than 3 different things in the recipe then you need 1, otherwise 2+), it will now appear in grey in the tablecrafting window. The tablecrafting window will also lists the requirements for each recipes it shows.	2015-03-11 19:36:51 +01:00
Ahammer18	aa2cf3c469	Added drone asses	2015-03-10 20:35:11 -05:00
phil235	5d5c21266c	Merge pull request #8262 from MMMiracles/usaneverdie ... Liberation Station 3: Patriotic Tears	2015-03-11 00:26:33 +01:00
Ahammer18	d2b650ad44	Changed "Toggle Suit Sensors" to "Adjust Suit Sensors" because we now have a menu that pops up when you want to change your suit sensors.	2015-03-10 18:20:14 -05:00
phil235	1eba7b694b	Merge pull request #8134 from Miauw62/ghostradios ... Adds a toggle so ghosts can hear radio chatter more easily.	2015-03-10 23:56:28 +01:00
phil235	cb96e65f1b	Merge pull request #8254 from Steelpoint/HoSGunSpelling ... [BALANCE]Buffs the Head of Security's Firearm.	2015-03-10 22:09:46 +01:00
Miauw	09cf2e474f	Reduces the taser firing delay.	2015-03-10 19:36:05 +01:00
MrPerson	692cfa4f1f	Pulling icon en-speedening ... Made the little pulling icon on the bottom right corner of your screen update right away when you start or stop pulling instead of updating as part of life(). Or Move().	2015-03-10 08:54:12 -07:00
MMMiracles	552232496b	typo fix	2015-03-10 09:18:12 -04:00
Steelpoint	a5ba5972b4	AdditionalSpelling	2015-03-10 17:26:05 +08:00
Cheridan	72f465c864	Merge pull request #8138 from RemieRichards/BadminFuckingWithIcons ... Clothing Icon File Admin Editing	2015-03-09 23:38:16 -05:00
MMMiracles	04a78be390	adds the freedom eagle, the only true friend a patriot can find within the region of socialist space.	2015-03-09 22:09:21 -04:00
Remie Richards	370a7100c7	Moves ninja shoes into the ninja folder	2015-03-09 23:02:26 +00:00
MMMiracles	1b1ee50b00	ASS BLAST USA USA USA USA	2015-03-09 17:50:37 -04:00
Remie Richards	751fb4aaa9	Adds SLOT_BACK for energy katana, makes energy katana call emag_act() on what it strikes (mirroring energy/blade functionality cleanly), Removes energy/blade hacks.	2015-03-09 21:48:45 +00:00
Remie Richards	f6e4c1518d	A restructure/removal/cleanup of Ninja Code	2015-03-09 20:43:56 +00:00
phil235	82b1b1adcd	Merge branch 'master' of https://github.com/tgstation/-tg-station into DoughChange ... Conflicts: icons/obj/food.dmi	2015-03-09 19:48:23 +01:00
phil235	bc091234ee	Changes egg breaking to use reagent_containers/glass/attackby() (fix issue with custom egg salad) ... You can only break eggs on glass containers (beaker,bucket,bowl,etc)	2015-03-09 19:43:39 +01:00
phil235	71d560bd3a	Fixes a runtime with buckling screen alert ... Fixes being able to buckle to janicart while crit and when there's a dense object on the janicart's turf. Fixes alien nest not buckling and being wrongly pixel shifted, and fixed a runtime. Fixes golems being super easy to weaken by punch and not doing more damage themselves via punch. Fixes some typos.	2015-03-09 19:09:52 +01:00
Remie Richards	d525fd6a87	Merge pull request #7872 from AnturK/hiss ... Makes NPC queens/drones plant weeds/eggs	2015-03-09 14:27:55 +00:00
phil235	4071f25270	Simplifies laser reflection code, no more reflect_chance var at the obj/item level.	2015-03-09 12:28:35 +01:00
Steelpoint	79857b0eac	InitalCommit	2015-03-09 17:02:34 +08:00
Cheridan	564238f335	Merge pull request #8215 from Ahammer18/Ahammer18 ... Slime Cake	2015-03-09 02:35:18 -05:00
Cheridan	b2d6abebb3	Merge pull request #8100 from Incoming5643/newbieguard ... Adds a free pass to assistant for player accounts younger than two weeks	2015-03-09 02:29:09 -05:00
Cheridan	fbab136950	Merge pull request #8016 from RemieRichards/EmbeddingBalance ... Embedded Item Balancing. Also fixes #8029	2015-03-09 02:03:18 -05:00
Cheridan	e846a6eeb4	Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack! ... Conflicts: code/game/gamemodes/wizard/spellbook.dm icons/mob/mask.dmi	2015-03-09 01:47:40 -05:00
Cheridan	5a6bacf139	Merge pull request #8073 from Xhuis/burn_this_message_after_you_read_it ... Adds paper burning	2015-03-09 01:09:41 -05:00
Cheridan	7b6532ca79	Merge pull request #7984 from Incoming5643/farewell_to_shitty_slimes ... Reworks the pink/light pink slime line to not be nearly worthless to breed	2015-03-09 01:03:21 -05:00
Cheridan	237f5c366a	Merge pull request #8177 from MrStonedOne/patch-2 ... IsBanned() now rejects blank ckeys/ips/cids	2015-03-09 00:31:26 -05:00
Cheridan	0015d4c120	Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch ... Skipping mulligan antag based on Time/Subjectivity from admins + tweaks	2015-03-09 00:14:28 -05:00
Cheridan	f4734de342	Merge pull request #8162 from Jordie0608/thisdrillwillnotpiercetheheavensbecauseithasbroken ... Fixes #8148, Improves drill's handling of power	2015-03-08 23:41:50 -05:00