Commit Graph

71 Commits

Author SHA1 Message Date
PKPenguin321
d9a214e931 adds bolas
adds the item itself and a hand-crafting method to handcuffs.dm
adds a tablecrafting recipe to recipes.dm
adds the sprite to items.dmi
2016-02-26 17:59:55 -08:00
PKPenguin321
8f2b3afd29 tweaks stun/teleprod tablecrafting recipes
removes the cell requirement from both, now you can craft one without a battery (but have to manually add the battery afterwords)
also changes the teleprod tablecrafting recipe to be consistent with the stunprod
2016-02-21 19:16:35 -08:00
tkdrg
41901027db Merge pull request #15362 from lzimann/table
Some table fixing
2016-02-10 19:18:32 -03:00
Leo
57aa7a8521 Ghost Mekhi no longer in the table 2016-02-10 03:43:07 -02:00
Leo
c0eda39018 Changes the 'usr' to 'user'
That's why you read before commit
2016-02-09 19:53:14 -02:00
Lzimann
831d2e04cc Fix tabecrafting menu opening when you click the table
Also adds a cursor change when you drag the table to you. And fixes tablecrafting menu not opening if the table is empty.
2016-02-09 19:46:39 -02:00
PKPenguin321
af0a05d55a halves most tablecrafting times
pretty much anything that was already below 20 was left alone
2016-02-06 17:55:07 -08:00
Razharas
ee607f5367 Some assembly requaired
Changes wirecutters for an igniter in a stunprod
Stunprod sparkles on proding
Timer now have repeating setting, will restart again and again after
expiring
Voice analyzer got exclusive mode that works like a password, i.,e. need
a perfect match of the phrase
Voice analyzer got voice recognition mode that remembers human voice
instead of speech, works like personality recognition
Voice analyzer got a sensor mode, works on any speech it hears from
anyone
Voice analyzer modes and changed by applying a multitool to it
2016-01-26 02:43:08 +03:00
KorPhaeron
4bdf1a882b Lizard hats 2015-12-29 13:01:13 -06:00
bgobandit
7d7468efe6 fixes honkworthy oversight 2015-12-12 15:38:40 -05:00
bgobandit
112dc6c6f6 adds feature inheritance, fixes recipe 2015-12-12 02:40:23 -05:00
bgobandit
5fa93e0e55 Adds the re-attachment of tails. Adds the attachment of tails to humans. Adds lizard clubs, liz o' nine tails and lizard cloche hats. 2015-12-11 19:03:09 -05:00
PKPenguin321
8e09b00f2c Merged upstream 2015-11-28 15:49:41 -08:00
PKPenguin321
cf29721672 fixes conflicts, adds the ability to remove the crystal from the prod via using it when no cell is attached 2015-11-26 18:28:12 -08:00
AnturK
e36853d7c9 Convert bots to simple animals - Updated 7.0 2015-11-26 22:06:07 +01:00
PKPenguin321
10f9e4af4f adds teleprods, a way to make them with bluespace crystals and a stunprod, and a tablecrafting recipe 2015-11-25 18:36:09 -08:00
Firecage
26bbd93522 Makes it so only advanced tool users can use tablecrafting. 2015-10-27 02:01:47 +02:00
Remie Richards
2e7cb827f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into CameraObscura
Conflicts:
	code/modules/crafting/recipes.dm
2015-10-26 00:04:36 +00:00
Remie Richards
d524b4acde Adds a special camera that can see ghosts (if the ghost is orbiting something they are skipped, this is to prevent it being used for power/meta gaming) the Chaplain spawns with one and they can be tablecrafted using a camera and holywater 2015-10-24 00:53:36 +01:00
Tkdrg
0458f939b4 Adds Chainsaws
Happy Halloween!

Sprites by WalterJe.

These are force 21 two-handed weapons. They are sharp and can be
tablecrafted by spending one circular saw, one plasteel sheet, and one cable
coil, plus a welding tool for crafting. The sound used is from the
freesounds.org and was released into the public domain. It is available
at https://www.freesound.org/people/esperri/sounds/118972/.

This is a rehash of PR #6320 if you're feeling dejavu.
2015-10-21 20:11:29 -03:00
KorPhaeron
6d706ee6d2 Tablecrafting 2015-10-19 14:06:40 -05:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00
Swag McYolosteinen
825b5794c7 Merge pull request #11239 from Firecage/del2qdel
del() to qdel()
2015-08-19 11:50:24 +02:00
Firecage
dfae1e0b53 Changes a lot of del() to qdel() 2015-08-16 23:33:22 +02:00
Cheridan
5979ffdec7 Logging Syntax Improvement 2015-08-13 12:14:14 -05:00
Ergovisavi
5f6cf57e07 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_fire 2015-07-21 05:32:08 -07:00
Ergovisavi
bf83ef4c53 Adds molotov creation recipe via tablecrafting, requring a drink bottle and a rag
Nerfs the rag, allows it to be made with the biogenerator, adds a few to the chef/bartender's closets, and to the maint loot spawner
Adds the ability to empty out a fire extinguisher... for sabotage
2015-07-19 04:12:30 -07:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Remie Richards
513b589d80 Merge pull request #10389 from Razharas/PinFix
Fixes pin removal having no category
2015-07-06 00:31:43 +01:00
Razharas
126b9e1b10 Merge pull request #10329 from RemieRichards/FixToolTextTablecraft
Fixes Tablecraft Tool Spam
2015-07-05 23:17:59 +03:00
Razharas
3cf25b4be0 Fixes pin removal having no category 2015-07-05 01:38:40 +03:00
Cheridan
96ff8ab617 Merge pull request #10265 from Razharas/PinRemoval
Added pin removal recipe
2015-07-04 12:50:11 -05:00
Remie Richards
2c899c84ab Fixes an indentation error that causes "Tools: X" to repeat in Tablecrafting. 2015-07-02 17:33:11 +01:00
Razharas
1a0c027cc2 Added pin removal recipe
Added pin removal recipe
You need plasmacutter to do it and some other shit
2015-06-29 18:43:37 +03:00
Remie Richards
4186d59e40 Filters the recipes you can currently craft to the top of the list. 2015-06-25 12:55:04 +01:00
Remie Richards
0611c9b3bb Adds a category for food items, adds some missing weapons and a Misc category 2015-06-25 11:58:42 +01:00
Remie Richards
d5a7b352d5 Table crafting now shows all recipes, all the time. Table crafting now has a concept of "Categories", current ones are: Weaponry, Robots and Ammunition, Table crafting 30 item limit removed. 2015-06-25 11:14:59 +01:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Iamgoofball
f992eb1af0 Adds feedback gathering for a hell of a lot more things. 2015-06-09 21:52:46 -07:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
MrPerson
0a6fb70137 IED fixes
Fixes #8919 - can pixel_x/pixel_y is inherited by the IED after construction
Fixes an unreported issue where the can underlay of IED's would be rendered underneath your HUD when it was in your hands.
2015-04-13 07:00:19 -07:00
phil235
e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
phil235
493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
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