Commit Graph

26 Commits

Author SHA1 Message Date
Jordie
94de5c997e Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights
Attachable Seclite & Camera to Helmet
2015-03-22 16:56:11 +11:00
Razharas
a67d8339b7 Merge pull request #8414 from phil235/TablecraftVarietyFix
Fixes not being able to tablecraft recipes using differen kinds of an item
2015-03-22 05:32:43 +03:00
GunHog
31c5e648f4 Secbots now require Sec helmets
Only Sec helmets with a camera and no flashlight can be used to create a
securitron assembly.
2015-03-21 17:10:55 -05:00
phil235
9b419d26f0 Fixes not being able to tablecraft recipes using different types of an item for a requirements (e.g. two types of cutlets to make a meat pizza).
Fixes mushroom requirements in tablecraft recipes appearing as "snacks" in the requirement lists.

Reduces the chem puff waiting time when spraying at short range, so it takes less time before it reacts with a turf/mob/object.
2015-03-18 20:57:30 +01:00
phil235
41279b3c03 Fixes spawned food not having normal amounts of nutriment and other reagents.
Upgraded microwave now adds more nutriment, vitamin and other reagents to the food it cooks.
2015-03-16 18:47:01 +01:00
Jordie
fb6aa85094 Merge pull request #8274 from Thunder12345/techshellening
Shotgun party, new shells, an improvement and a fix
2015-03-16 18:30:14 +11: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
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
Thunder12345
8a780e89bf Overloading improvised shells
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
2015-03-11 11:41:26 +00:00
Thunder12345
9723f6d092 Laser slugs + improvised shell fix
Adds laser slugs, fixes improvised slug recipe
2015-03-10 15:55:29 +00:00
Thunder12345
56ab83d4e7 Ion shell updates
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
2015-03-10 14:42:08 +00:00
Thunder12345
a1a5edd314 FRAG-12, ion, improvised shotgun shells
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
2015-03-10 13:57:54 +00:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
phil235
549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
phil235
732a54fe63 Making all meat subtypes of snacks/meat
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
phil235
0aa8e4b5ad Adding a table proc checking whether the table is too crowded to craft things on it.
Two small fixes.
2015-02-08 00:50:19 +01:00
phil235
f6b0f57e89 last fixes I hope:
tiny change to latexballoon (b/c I reorganized is_sharp proc already, so why not)
some fixes suggested by razharas in table.dm
Renamed microwave to microwave oven. Adding efficiency effect (upgrading the machine)
Adding rolling pins to the kitchen vending machine (so the two cooks don't fight.
2015-02-07 20:10:11 +01:00
phil235
faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
pudl
10c7b422f1 -capitalizes Ephedrine in sleepers
-cryo now plays a ding when you're ejected
-fixes the salglu description, nerfs it to middle ground between the too-op version and the too-weak version
-buffs synthflesh to 1.5 per cycle, like on goon
-reverts the charcoal buff, it was fine way back when
-fixes morphine not putting you to sleep
-removes drowsiness from diphen, it's not supposed to do that
-epin actually no longer causes stun reduction on goon since it was too op. it's now removed here as well.
-fixes the histamine description. now, instead of it being deadly at any amount, it's accurate to how it is on goon. if it's below 30u, it's purely annoying. even coughs and sneezes don't make you drop items. when you overdose it is very deadly, but not nearly as much as it used to be. changes the dizziness to blurriness as it is on goon.
-cyanide now actually causes losebreath like it's supposed to, and stuns you instead of putting you to sleep for a half a second like it's supposed to.
-cryo spaghetti code removed, it now only heals 3 brute and burn instead of 6.
-chemicals are now mostly colored
-adds mannitol to the cryox recipe, since we can't port one of the chems used in the recipe on goon
-renames polyacid to Fluorosulfuric and makes the recipe a bit harder, but it has more units as a result now.
-syntiflesh is now named synthmeat and requires cryox instead of clonex
-silver sulf now does what the description says it does
-changes the eating message to be less wordy and hugbox
-buffs salacid to make it worth using
-removes ephedrine and salbu addiction, since they're very useful chems that don't need that
-removes ephedrine walkspeed buff, it wasn't supposed to do that. also makes it not stun you and be a grief tool.
-buffs atropine to work as long as you're in crit
-removes ethyl since antihol replaced it
-comments out clf3
-adds an 8tc traitor item, the stimpack. single use 50u syringe that makes you run fast and resistant to stuns a little bit, heals you when you're below 50% health.
2015-01-20 23:21:11 -06:00
paprka
595ad8df58 fixed compile errors 2014-12-24 21:03:22 -08:00
Thunder12345
8e2dc381ed FRAG-12 + admins.txt
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
2014-12-11 21:16:45 +00:00
paprka
929662ad3a moved files and fixed tablecrafting 2014-10-17 10:30:04 -07:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
MrPerson
863f28f295 On second thought, leave the result as just a path
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-10-10 14:30:41 -07:00
MrPerson
694f9fda91 Tablecrafting improvements:
Allow more than one result. All components will be placed inside the first result in the list.
Completion of crafting will now reset the interface, if possible.
Opening the interface now causes you to face the table.
2014-10-06 01:24:26 -07:00
MrPerson
b04f547cd1 Move table crafting into the modules folder 2014-10-04 23:43:03 -07:00