Commit Graph

2253 Commits

Author SHA1 Message Date
Cheridan
edc38ce181 Merge pull request #2586 from GarrusVakarian/issue#2454fix
Fixed issue #2454 (Ian loving people while dead)
do note however, that Ian still loves you very much
2014-02-02 13:04:07 -08:00
fleure
68abd1f0e4 Merge pull request #2510 from Tenebrosity/throwsounds
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
Cheridan
00d85c344d Merge pull request #2547 from Ergovisavi/mushroom_hunter
Walking Mushrooms will now hunt and eat eachother
hydroponics best department
2014-02-01 21:14:28 -08:00
GarrusVakarian
f47ea4fb7b Adapted to programming standard 2014-02-02 04:57:57 +01: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
Aranclanos
17d466199c fixes issue 2587 2014-02-01 22:03:41 -03:00
GarrusVakarian
b274311f02 First commit! Fixed issue #2454 (Ian loving people while dead) 2014-02-02 00:10:03 +01:00
Ergovisavi
f52bbaa2b3 Walking mushrooms will inherit some of the original properties of the food item that they were spawned from.
Walking shrooms with ckeys will not gain levels, unlike wild ones, to keep things from getting silly.
2014-01-31 19:09:22 -08:00
Cheridan
b68e6c56f5 Merge pull request #2556 from MrPerson/slime_lying
Makes slimes no longer lie down.
2014-01-31 15:46:43 -08:00
fleure
1df33a981a Merge pull request #2555 from MrPerson/whitescreen_on_software_fix
Stops the whitescreen of death some users were having. Also "readds" the red-damage-bloody-screen-so-real.
2014-01-31 14:25:43 -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
Ergovisavi
6208e6e763 Expanded on walking mushroom fights. Walking mushrooms now all have different colored caps, and you can save them from being eaten by feeding them a mushroom so they can live to fight another day. 2014-01-31 01:20:42 -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
6d8f911023 Merge pull request #2504 from RobRichards1997/25/01/2014-Magicks-bad
Fixes #2503 - Mechs Vs. Wand of death
2014-01-30 10:43:13 -08:00
MrPerson
86fa35ef09 Add support for non-0 based turns (ie 90 to 180) while retaining correct pixel_y offsets. 2014-01-30 06:37:20 -08:00
MrPerson
b4d2ba33cb Fixes rollerbeds and their offsets so they don't look stupid. 2014-01-30 06:02:46 -08:00
MrPerson
c7d62c7219 Makes slimes no longer lie down. 2014-01-30 01:30:23 -08:00
MrPerson
a147d122bb Stops the whitescreen of death some users were having. Also "readds" the red-damage-bloody-screen-so-real. I'll get a screenshot in a bit.
Source of the bug: I changed the red screen to use BLEND_MULTIPLY. Due to a mistake I made, the white part in the middle was fully opaque, but since it was a multiply blend, that didn't matter. Turns out in software mode, MULTIPLY defaults to OVERLAY or something, so users in software mode were seeing a fully opaque, non-blended white screen rather than a slightly red tint. Nasty.

Also multiply was stupid. The red was barely noticeable in many cases. Against black like space or things you couldn't see, the red literally didn't even display. No idea why I was so insistent on using this.

Solution: Instead I'll use BLEND_ADD which works just fine in software mode. However, ADD can't add blackness, so I have to have a second layer of darkness on the edges. Also I made the red on the so real blood screen brighter and more intense because it looked kind of dumb. This will probably need to be toned down or even reverted but that's ok.
2014-01-29 20:18:48 -08:00
Ergovisavi
d56f48d241 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 2014-01-29 14:56:06 -08:00
Ergovisavi
8906d8a28d Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-29 12:27:26 -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
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
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
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
fleure
aed37f1498 Merge pull request #2425 from adrix89/Seer_change
see_invisible rework  in life
2014-01-26 10:45:26 -08:00
fleure
9cd4d36db9 Merge pull request #2495 from Jordie0608/bluecarpareslower
Holocarp, like normal but cooler and less corpsey.
2014-01-26 09:46:53 -08:00
Robson Richards
704d798152 Removes unnecessary type check from projectiles/projectile/magic.dm death projectile. 2014-01-26 16:37:53 +00:00
Robson Richards
a66f138215 Fixes Mechs dieing to Wand of death
Changes simple_animal/Die() because it disagrees with simple_animal/Life() due to the health variable
2014-01-25 15:50:12 +00:00
Ergovisavi
45cfb68ac5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs 2014-01-24 23:12:01 -08:00
Ergovisavi
a7e76ea7b1 Added proper sprites for the kinetic gun, removed redundant lines in hostile mobs, fixed an issue with mining mobs where they would update their icons after death if something was thrown at them 2014-01-24 22:52:43 -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
Jordie0608
b143783881 Holocarp, like normal but cooler and less corpsey. 2014-01-25 04:11:10 +11:00
Ergovisavi
0867a0a047 Hostile mobs with environment smash enabled will break out of containers/disposals/sleepers
Hostile mobs with environment smash locate and break the containers/disposals/sleepers that their targets are hiding in.
2014-01-23 23:57:36 -08:00
Tenebrosity
5965772782 Adds sounds to falling over
Resting and buckling are still silent.
2014-01-24 15:12:24 +13: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
Ergovisavi
9fef44c32e Kinetic gun can now break through mining tiles due to the goliath being able to possibly trap you in an unwinnable situation otherwise
More mob behavior vars in hostile animal, added Passtable to hivelord and brood and removed their environment smash
2014-01-22 17:44:32 -08: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
Tenebrosity
da8838d411 Throw impacts play the thrown object's hitsound 2014-01-23 02:29:39 +13:00
Ergovisavi
9e6cd7fba5 Merge branch 'master' of https://github.com/tgstation/-tg-station into Miningmobs
Some more AI behavior var tweaks
2014-01-21 22:59:46 -08:00
Ergovisavi
64fa80de7f More hostile mob work with behavior vars, getting rid of idle_env_destroyer nobody uses it, other tweaks 2014-01-21 22:15:28 -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
Cheridan
b583b83608 Merge pull request #2466 from Incoming5643/slimetime
Slime refactoring fixes
2014-01-21 20:17:00 -08:00
Incoming
eb8454006f Fixes dark purple, dark blue, and light pink slimes not working right because of their spaces 2014-01-21 20:00:30 -05:00