Commit Graph

283 Commits

Author SHA1 Message Date
Cheridan 839ee11308 Merge branch 'master' of https://github.com/tgstation/-tg-station into hydro
Conflicts:
	code/game/machinery/drying_rack.dm
2014-02-18 15:25:16 -06:00
Cheridan 8f509fc4b2 drying rack as smartfridge
Converts the drying rack into a smart fridge, allowing for better usability (can now batch-dry), code cleanliness and reuse.
2014-02-18 15:16:40 -06:00
Sugarette b48583a587 Merge pull request #3 from Sugarette/master
Wonder if it works
2014-02-18 22:07:56 +03:00
Miauw 3b24bb64f4 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
Hornygranny 2134add41b Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range. 2014-02-17 15:44:07 -08:00
Sugarette c5488cc6ce Replaced empty string with null in origin_tech
Changed it to keep in line with what seems to be a standard.
2014-02-17 10:47:21 +03:00
Hornygranny 9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
Miauw 0328f437ff finishes up nodrop as far as i can be arsed to 2014-02-15 16:22:25 +01:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
hornygranny 04aeb15af7 Rebalanced strange throwforces 2014-02-13 17:47:25 -08:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Miauw 8c7ef19be6 Replaced before_take_item() and drop_from_inventory() with u_equip 2014-02-12 19:51:37 +01:00
Tenebrosity ad8568b8c5 Cleans up if checks in stack examine() 2014-02-10 19:55:37 +13:00
Tenebrosity f70c8d29d9 Fixes misc grammar issues 2014-02-10 19:46:33 +13:00
Cheridan ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Jesus Hussein Chris 52339906c4 Attack sounds for all melee weapons
Weapons that do no damage play a tap sound, except for the bike horn and banhammer.

Adds a different attack message for forceless attacks. It says tapped or
patted on instead of attacked in.

Adds force zero check to armour before attempting to block attacks.

Adds hitsounds to the welder, lighter, matches, cigarettes, energy sword and energy axe for when they're on and off.

Adds 5 force to the lighter when it's lit. Same as when you accidentally burn yourself lighting it. Adds a hitsound and the correct damage type to the lighter.

Adds hitsound volume scaling based on the weapon's force and its weight class. Adds tap sound scaling based on a weapon's weight class.

Removes boldness from item attack messages on non-human mobs. The attack is still bolded for the player
controlling the mob.

Adds a force check to blood spurts when attacking non-human mobs. If the weapon doesn't have a force, no blood will come out.

Adds adminhelp.ogg as the banhammer's hitsound with Cheridan's permission.

Adds a much needed period to the catatonic human examine message.

Makes the activation and deactivation sounds of toy swords, energy swords and energy shields quieter. What an earsore.

Makes description, item_state and name of matches that have burned out on their own consistent with those put out by the player. Changes match, cigarette and lighter attack verbs and forces based on whether they're lit or not.

Fixes a bug that allowed players to light cigarettes with burnt matches.

Names lit cigarettes and children of cigarettes lit [name].

Fixes a bug with the energy blade that kept it at weight class 5 after it was deactivated.

Changes the welder out of fuel message slightly to be less fragmented.

Removes dead air from most of the weapon sound effects used in this pull to make them more responsive. In other words, the fire extinguisher sound will play a lot sooner after you click than before. Equalised their peak volumes to all be -0.1dB and in an attempt to make altering volumes based on force more consistent.

Thank you @YotaXP for help with the item_attack.dm attack messages.

Thank you @optimumtact for help with code for testing item_attack volumes.

Thank you @Giacom for help with the code for scaling hitsound and tap sound volume by hitforce.

Thank you @Tastyfish for telling me why my proc wasn't working.

Thank you to anyone else on #coderbus who helped me who I've forgotten to mention.
2014-01-28 22:46:41 +13:00
Razharas 785fc6f153 Fixes racks 2014-01-22 03:18:37 +04:00
Razharas ea54257ab6 Ported cable coils to stacks crudely
Yeah
2014-01-22 02:11:19 +04:00
JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Pete Goodfellow af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Hornygranny 01ce0f5392 Removed copypaste for cyborg metal sheets
Fixed typos
2014-01-17 15:45:09 -08:00
JJRcop b82af39ed1 dds Drying Rack, Various Plants, Rollies, Pipes, and Torches
Any and all content credit to @Adrinus and @Iamgoofball
I simply re-applied all the changes by hand so it is compatible with current code
 #1893
2014-01-07 15:40:49 -05:00
Aranclanos 233a5b3b9b Fixes runtimes regarding using ointments/bruisepacks/surgery drapes while targeting eyes/mouth/groin or using them on other mobs. 2014-01-06 06:34:17 -03:00
Cheridan 3a11af405c Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2192
Conflicts:
	code/modules/clothing/head/misc.dm
2014-01-02 10:00:58 -06:00
fleure be0f52b623 Fixed bruisepacks not working 2013-12-31 17:06:34 +00:00
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Robson Richards d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Robson Richards 53bfd06609 Fixes #2180 - Augmented limb healing issues 2013-12-29 16:12:32 +00:00
Cheridan b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
Item name fixing round3
2013-12-26 23:14:15 -08:00
Miauw 0338a66c2a Adds fingerprints to a bunch of stuff. De-texts computer build paths. 2013-12-22 18:57:33 +01:00
Kyrah Abattoir 3496dc4e0a Merge branch 'master' into ItemNameFixingRound3 2013-12-10 17:32:45 +01:00
Kyrah Abattoir 7e2b7805cc FIXED: inconsistencies with stack item names.
CHANGE: stacks are gender = PLURAL by default because it fits.
2013-11-24 00:14:46 +01:00
Robson Richards e71ea3289e Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff
This probably broke everything... :(
2013-11-17 18:09:14 +00:00
Robson Richards 637c3f7f63 Fixes for @Aranclanos
Diseases now have a requires and a required_limb variable
if requires is 1 then it will run a check for required_limb (WHICH USES TYPEPATHS)

Reverts a turret change that git through into the pull for some reason

added some feedback messages in certain places

removed the hulk-like snowflake check that was really crappy anyways

Reworked a part of surgery/surgery_step.dm to use a switch
2013-11-16 18:13:41 +00:00
Robson Richards 6587fe30cd Fixes an earlier attempt at the previous commit
Fixes a comment that was a DIRTY LIAR
2013-11-10 02:04:00 +00:00
Robson Richards b2b6a9ff84 Fixes Chem healing and Chem damaging of Robotic limbs
Hey @Cheridan NO ISTYPES! :D
Ugh.. I mean "Removes" 10 totally unnecessary istypes
Fixes the healing of robotic limbs so that the message actually doesn't display now.

Credit to ACCount12 for digging around and finding some nifty code
that my brain never thought of
2013-11-10 01:55:40 +00:00
Robson Richards 78ee2d0c32 Updates code/game/objects/items/stacks/medical.dm - Woopsie. 2013-11-01 19:50:09 +00:00
Robson Richards a9b725db2f Lot's of stuff, Read full Commit log
Cybernetic limbs
Multi-location operations
Limbs have sprites now (They never dropped before so it was irrelevant)
No Organic healing of Robotic limbs (But the message is still there, fixing soon)
No "organic" diseases in Robotic areas
No more operations in robotic areas - Cheer's Pete for the surgery system being so nice
Healing Robotic limbs with welders (brute) and cable (burn)
Probably other things I forget
2013-11-01 19:44:07 +00:00
supersayu 799c7ad2ce Replaces atom/HasEntered() with the builtin atom/movable/Crossed()
Crossed() is a byond builtin which is called automatically when two movable atoms overlap (as a side effect of Move(), but not when loc or x/y/z is changed).  Previously, turf/Entered() iterated through all objects in the turf in order to tell them an object had entered; with this change, HasEntered() becomes redundant and can be eliminated.

This may reduce lag when a large number of objects are moving in a small space (singularity, mining conveyors, etc) but should cause no changes to functionality at all.
2013-10-23 16:20:20 -04:00
Robson Richards 1c70008d0c Changes Limbs into Obj's
Reworked all the paths for it
Reworked all the procs for it
2013-10-11 19:11:55 +01:00
Robson Richards 50c5e7ee74 Cleans up the new cyborg floortile, Thanks for spotting it Aran! 2013-09-24 15:55:06 +01:00
Robson Richards 4995b64c18 Moves the plasteel/cyborg into plasteel.dm, works the same, Convenience 2013-09-21 17:27:39 +01:00
Robson Richards 6dba8dec10 Gives Engiborgs Floortiles
Rechargestation is set to replenish them aswell
2013-09-21 15:51:19 +01:00
supersayu a993ce62db Bugfixen and minor changes. Fixes #136.
Adjusts the click code to not use client/Click().  The code is largely unchanged, except that it allows the compiler default behaviour of calling atom/Click(), and then forwards the call to mob/ClickOn().  I had some reports that melee combat mixed with movement was behaving oddly, and I believe it may be due to the use of client/Click; the byond documentation says that redefining client/Click() causes additional overhead, and it isn't strictly necessary.

Alters the way double clicks are handled, in an attempt to better handle clickspam, as often occurs during pitched combat.  This may also be responsible for the above, but I don't know.

Inserts proximity (aka flag) checks in all afterattack() procs.  The old assumption was that unless an item used the USEDELAY flag, afterattack() was only called when adjacent, but this is no longer true.  This led to beakers, soap, crayons, etc, all being usable at all ranges.

Removes the NODELAY flag, which was unused.  Removes all existing uses of the USEDELAY flag so that it can be readded to things that need extra delay.

Removes the hand_* procs, previously used by restrained actions.  Instead, the mob helper mob/RestrainedClickOn() has abosrbed basically all the functionality they were used for, which is really only monkeys with jungle fever.

Adds a special case of the Adjacency() proc for doors.  This fixes #136, airlocks being unreachable due to border fire doors.  However, this only takes us back to the unpleasant position where you have to open-hand the door, switch to a crowbar, and pry open the firedoor; it still needs a better fix.
2013-09-17 18:19:14 -04:00
Aranclanos 0ce01d1583 Adding Linda. 2013-08-10 06:15:14 -03:00
Incoming a99d04f88c Removed some redundant code 2013-07-22 18:34:57 -04:00
Incoming ef1f2d9d75 Did what I could to make the die/shard code for this not as shitty, as implored and largely written by Aranclanos 2013-07-21 00:44:43 -04:00
Pete Goodfellow b27b66a344 Fixes #672 Shards cut you when you put them into your bag
Moves the shard define into glass.dm
The "You step in the broken glass!" message only appears if you aren't wearing shoes.
Other misc changes and fixes.
2013-05-29 20:27:57 +01:00