Commit Graph

4879 Commits

Author SHA1 Message Date
adrix89 1e9a85b672 Merge branch 'master' of https://github.com/tgstation/-tg-station
Merge branch 'master' of https://github.com/tgstation/-tg-station

Spray bottles doesn't make floor wet anymore.
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.

Soap cleaning and uses.

Reworked spray

Revert soap uses, if there are not easily accessible,they are fine.

Revert fixes
2014-02-04 20:00:57 +02:00
Cheridan 5b5d7eecb9 Merge pull request #2592 from Tenebrosity/git_gud_shoes
Fixes grammar of examine messages for objects that are pairs
2014-02-02 16:36:57 -08:00
Cheridan 07e33da535 Merge pull request #2588 from Tenebrosity/windoor_consistent_attack_messages
Standardises windoor attackby and hitby messages
2014-02-02 16:19:54 -08:00
Cheridan e60ecbb1f4 Merge pull request #2590 from GarrusVakarian/issue#2436fix
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 16:08:45 -08:00
Cheridan 60576bc1a2 Merge pull request #2551 from Boggart/turretfix
Fixes turret construction
turrets are the worst. i mean, jeez.
2014-02-02 10:08:59 -08:00
Tenebrosity 6ae7051977 Removes an if check based on Pete's suggestion
Thanks
2014-02-03 06:18:34 +13:00
GarrusVakarian 94bbf55ce3 Adapted code to Jordie0608's fix 2014-02-02 18:01:46 +01:00
fleure 68abd1f0e4 Merge pull request #2510 from Tenebrosity/throwsounds
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
Cheridan 8fa0db4c23 Merge pull request #2581 from Razharas/AutolatheFix
Fixes autolathe and sheets
2014-02-02 00:50:05 -08:00
GarrusVakarian 30c4694487 Adapted to fit programming standard 2014-02-02 05:22:39 +01:00
Tenebrosity f3da1a0904 Fixes examine message for pair objects
Before:
This is some brown shoes. It is a normal-sized item.

After:
These are some brown shoes. They are a normal-sized item.
2014-02-02 15:49:20 +13:00
Cheridan 417ccb38ea Merge pull request #2574 from Miauw62/armbladefixes
Arm blade  bugfixes
2014-02-01 18:28:16 -08:00
Cheridan 1d54687b2b Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds
Attack sounds for all melee weapons
2014-02-01 18:01:59 -08:00
Tenebrosity e1298a4be0 Standardises newscaster attack messages 2014-02-02 15:01:47 +13:00
GarrusVakarian f71ffde259 Fixed issue #2436 (Classic baton stuns borgs) 2014-02-02 02:05:15 +01:00
Tenebrosity 43d0cfe73d Windoor attackby and hitby message consistency
Changes both messages to be consistent with windows and grilles, and
removes their distracting boldness.
2014-02-02 13:00:07 +13:00
Boggart 192597daef Removed some unneccesary whitespace. 2014-02-01 13:05:23 -07:00
Razharas b02fb6d143 Fixes autolathe and sheets
Fixes #2579
2014-02-01 13:30:04 +04:00
fleure 97b99e47f6 Merge pull request #2558 from MrPerson/rollerbeds
Fixes rollerbeds and their offsets so they don't look stupid.
2014-01-31 14:13:51 -08:00
Miauw ad13fc3510 Arm blades are no longer telekinetic table-breakers. Fixes an arm blade typo. Fixed #2559
Arm blades no longer delete stuff. Fixed #2570
2014-01-31 18:07:48 +01:00
fleure acf5bccfa6 Merge pull request #2561 from Razharas/LingFix
Fixes ling dna handling and tiny dna scanner fix
2014-01-30 15:41:23 -08:00
fleure 1d0f55bff7 Merge pull request #2536 from metaglog/mulebot_panel
Minor fix to make mulebot hacking more convenient
2014-01-30 15:14:41 -08:00
fleure 6c07d2bae2 Merge pull request #2549 from Incoming5643/PussyGalore
Fixes the fucking cat crate jesus christ goddamn
2014-01-30 14:56:50 -08:00
Razharas eeccd4d188 Fixes ling dna handling
Now this is all done properly
Also tiny tiny little fix of dna scanners ignoring their upgrade
2014-01-31 00:17:31 +04:00
Malkevin 302376eeeb Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/game/objects/items/toys.dm
2014-01-30 19:14:43 +00:00
fleure 3a0d12838a Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
fleure cb318996b5 Merge pull request #2524 from Incoming5643/ImUpset
Removes the "SmoothOperator" bundle
2014-01-30 10:25:26 -08:00
fleure 86d064451a Merge pull request #2543 from Petethegoat/whyGOD
Removes unused vars from /obj/item
2014-01-30 08:31:37 -08:00
Incoming a8aff5e534 Fixes the Fix, wouldn't want people getting two corgis for the price of one, no that'd be terrrrrrrible 2014-01-30 10:52:32 -05:00
MrPerson b4d2ba33cb Fixes rollerbeds and their offsets so they don't look stupid. 2014-01-30 06:02:46 -08:00
Boggart 648d9002ee Fixes turret construction so that you can actually build types other than taser turrets, also makes it so that lasertag turrets don't stun their own team. 2014-01-29 18:35:48 -07:00
Incoming 40cd679747 Fixes Cat Crates, Corgi Crates and Chick crates.
File bug reports you guys, seriously.
2014-01-29 19:20:26 -05:00
Ergovisavi 8906d8a28d Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-29 12:27:26 -08:00
Pete Goodfellow 4460869113 Removes unused vars from /obj/item 2014-01-29 17:19:20 +00:00
metaglog 7945bab343 Call attack_hand instead of interact to trigger additional checks. 2014-01-29 09:41:00 +01:00
metaglog 0d239ca7c9 Parens placement. 2014-01-29 08:28:59 +01:00
metaglog ebcb503611 Mulebots can now be attacked by the appropriate tool to open the hacking panel. 2014-01-29 08:17:27 +01:00
fleure 2aafd19d2e Merge pull request #2513 from Boggart/AiRestorerFix
Fixes the AI restorer eating the AI
2014-01-28 14:17:57 -08:00
Tenebrosity 0851b341da - Removes the throwtapsound var from items. It was unnecessary.
- Thrown items play throwhitsound on impact. If no throwhitsound is defined, they play hitsound instead. If that isn't defined, they play genhit.ogg. The latter fixes \#2508. The volume of the sound is dependant on the item's throwforce and/or weight class.

- Adds 15 throwforce to the fireaxe, which previously had only 1.
2014-01-29 10:51:14 +13:00
fleure 6908a7194b Merge pull request #2501 from Tenebrosity/fallsounds
Adds sounds to falling over
2014-01-28 11:44:49 -08:00
Boggart 555b385799 Changed to use span classes for warnings
Updated to use span classes as requested by Fleure.
2014-01-28 12:03:07 -07:00
Robson Richards 859d909a2b Adds sanity checks to Robotlimb repairs 2014-01-28 17:03:25 +00: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
Boggart b606a250a9 Removed "the" from the denied message
Removed "the" from the denied message as suggested by MrPerson.
2014-01-27 02:45:24 -07:00
Tastyfish 7c021aafd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into crates 2014-01-26 22:56:56 -05:00
Incoming c0d41485a3 Removes the "SmoothOperator" bundle for being dreadful compared to the other bundles
Bundle included
Stetchkin (TC ???): the gun we gave nuke ops to tell them they had to buy their own guns now. Has nonrefillable ammo.
A silencer (TC 2): makes the gun a normal item (one of its only pluses was it was a small item).
Syndie Soap (TC 1): slips forever.
A Trash Bag (TC 0): It's a bulky item so once you take it out of the box you're stuck explaining to everyone why you're carrying a trashbag as not a janitor.
A Body Bag (TC 0): Obtensibly to drag off corpses without leaving a mess... but then why do they get the soap?
A Suit (TC 0): Availible for free in the locker room closet
Lace Up Shoes (TC 0): "Shoot me, I'm valid!"

Since you can't buy a Stetchkin I can't give it an absolute value, except to say that it's worse in almost every respect to the revolver. which is 6.

Even if you are VERY charitable and give it the full 6 valuationyou still have a bundle that awards you less than 10TC of items where every other bundle awards you more than 10TC (that's the point of taking a bundle).

http://www.youtube.com/watch?v=RiMOKmp0uZc
2014-01-26 22:41:48 -05:00
Tastyfish eb5c37beb8 Fixed the issue with newscasters where putting a single quote (') into the title of a channel broke posting messages to the channel due to mismatch of html encoding schemes. 2014-01-26 22:30:48 -05:00
fleure bd85a001fc Merge pull request #2404 from Razharas/LingTransformFix
Ling transform fix
2014-01-26 12:34:56 -08:00
fleure 7009c447f1 Merge pull request #2393 from Balrog-was-here/inb4gambittraitor
[MAP] Syndicate playing cards and deck style support for playing cards
2014-01-26 12:19:11 -08:00
Malkevin a1c4c4bbd7 Merge branch 'master' of https://github.com/tgstation/-tg-station into bugfixes
Conflicts:
	code/modules/mob/mob.dm
2014-01-26 19:22:33 +00:00