Commit Graph

2397 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Balrog
461415430e Merge remote-tracking branch 'origin/master' into inb4gambittraitor
Conflicts:
	icons/obj/toy.dmi
2014-01-26 14:02:35 -05:00
fleure
fba7c32a5c Merge pull request #2455 from Rolan7/Issue297_Gib_Fix
Issue 297 Gibbing in pipes fix
2014-01-26 10:56:26 -08:00
Balrog
c5a2f28a47 Refactored card vars. Fixed some broken card deck instances on the map. 2014-01-26 13:55:57 -05:00
Ergovisavi
45cfb68ac5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-24 23:12:01 -08:00
Ergovisavi
cc738f7dcd Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-24 16:33:51 -08:00
fleure
8660698ce0 Merge pull request #2444 from Miauw62/somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Adds changeling arm blades
2014-01-24 12:49:05 -08:00
fleure
277a33c184 Merge pull request #2482 from Tenebrosity/throwsounds
Thrown objects play throwhitsound
2014-01-24 11:37:06 -08:00
fleure
e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
fleure
7abb6d1af4 Merge pull request #2484 from Giacom/bloody_hands_so_real
You can now properly clean your hands of blood. Fixes #2258.
2014-01-24 11:15:32 -08:00
Tenebrosity
e4739afc44 Item throwtapsound var for forceless objects 2014-01-23 23:07:24 +13:00
Ergovisavi
3b6208eae1 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
2014-01-22 20:37:47 -08:00
Tenebrosity
b77434b1cb Items now have a throwhitsound var
If throwhitsound isn't defined, a thrown item calls the hitsound
instead. If that isn't defined, no sound is played.

Circular saw now calls pierce.ogg as its throwhitsound instead of its
hitsound.
2014-01-23 16:37:54 +13:00
Giacomand
4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand
6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
Giacomand
86d4d5307a You can now properly clean your hands of blood. Fixes #2258.
When you touch an item, to spread the blood, it would take the "bloody_hands" to 0; which is checked if true while you wash your hands. I limited it to only go down to 1, so it will still be true unless you wash your hands.
Fixed an issue where blood_DNA was being cleared before the blood_hands variable was being set to 0. Now you can properly hide your bloody hands with gloves and when you take them off the hands will still be bloody.
Removed an unused variable.
Set the bloody_hands_mob to null where it was appropriate.
The amount of blood you can transfer to other items, when you touch them, will be a little random for variety.
Revive() will now heal your hallos damage.
2014-01-22 17:42:36 +00:00
Miauw
4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
fleure
da5ef34c29 Merge pull request #2461 from JJRcop/nuke-toy-tweaks
Nuke toy tweaks
2014-01-22 07:52:13 -08:00
Cheridan
290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
MrPerson
9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
JJRcop
36ec9cbb6b Nuke toy no longer uses process and instead uses sleep
I don't know what I was thinking with the process, oh well!
2014-01-21 16:52:10 -05: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
Robson Richards
1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
Ergovisavi
c1fa50976b Merge branch 'master' of https://github.com/tgstation/-tg-station into Gibtonium 2014-01-20 17:48:38 -08:00
Rolan7
5d931d70ef Larvae who chestburst while their host is swallowed are now properly added to stomach_contents, so they can be regurgitated. As are the gibs from the gibbing.
Tidied up the loop in alien_powers.dm
2014-01-20 15:43:43 -05:00
JJRcop
a52678531c Nuke toy tweaks
Made the cooldown noticable
Shortened cooldown to 3 minutes
2014-01-20 15:38:06 -05:00
Pete Goodfellow
e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
fleure
ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
fleure
d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
Rolan7
5f1fae05dd Gibbing now occurs in whatever the mob happens to be in, instead of fetching the turf. 2014-01-20 01:37:43 -05:00
Cheridan
9cbb9bb403 Merge pull request #2434 from johnsmith38/master
Black Baseball Caps [FIXED]
2014-01-19 20:21:40 -08:00
Cheridan
70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Alek2ander
ecf50f2de8 Goodbye nuke 2014-01-19 22:15:28 +04:00
Miauw
13b3cd69f2 Adds changeling arm blades that can slice tables apart and break computers and generally be robust. 2014-01-19 18:33:03 +01:00