Commit Graph

2270 Commits

Author SHA1 Message Date
MrPerson
931da9e7ef Many changes
Much diff
2014-02-04 22:49:38 -08:00
Mloc-Argent
a677ae8377 Adds crlf default to .gitattributes for most text file types we use.
Massive green/red is to the best of my knowledge caused by files being nearly entirely LF.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-02-04 15:14:39 +00:00
Razharas
2ac38e0706 Merge pull request #2557 from Tenebrosity/awaycorpsespawnerfix
Fixes away map dead slime and AI spawners
2014-02-03 23:05:25 -08:00
Razharas
43a5b6a605 Merge pull request #2583 from Incoming5643/bugfixenfeb
Various Bugfixes
2014-02-03 22:05:18 -08:00
fleure
43db629b4d Merge pull request #2599 from Ergovisavi/mobs_hate_mechs
Fixes issue #555
2014-02-03 13:41:28 -08:00
fleure
0d68be7931 Merge pull request #2564 from Tenebrosity/fallsounds
Fixes thuds in space and code for hats falling off
2014-02-03 10:41:59 -08:00
fleure
a854a41994 Merge pull request #2540 from Incoming5643/blobjob
BE_BLOB and easy adminblobing
2014-02-03 10:34:31 -08:00
Cheridan
ad235cf18f Merge pull request #2563 from Razharas/NewTables
New PR for crafting tables
2014-02-03 08:46:56 -08:00
Ergovisavi
9288ca9d69 Fixes issue 555 by making hostile mobs run CanAttack() on the occupant of mechs
Fixes Walking Shrooms not having full health when spawned due to the way their health is randomized on New()
Removes unncessary logging in friendly gold slime reactions, hostile ones retain logging.
Adds asteroid mobs, mushrooms, and holocarp to the blocked list for gold slime reactions.
2014-02-02 18:52:36 -08:00
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
Tenebrosity
e33f91229b Gameticker checks for mind in end of game readout
This stops AI corpses showing up in the end of round report. It also
means that a ghosted (whether after death or by going catatonic) AI or
borg will now have its player shown at the end of the round.
2014-02-03 05:27:03 +13: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
Incoming
c587f95d03 Changes the returns around for facehuggers to be inclusionary return 1 instead of exclusionary return 0 2014-02-01 20:44:17 -05: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
Incoming
45cf5ec20c Various Bugfixes
Fixes #2534
Fixes #2431
Fixes #2493
Fixes #2500
2014-02-01 11:29:37 -05: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
Tenebrosity
560c5fc781 Fixes thuds in space and hats falling off
Fixes #2550 by adding a check for space turf at the location of the mob
before playing a bodyfall sound

Fixes #2494 by following Carn's suggestion of determining whether a hat
will fall off based on its head cover and head hide flags.

Thank you @Razharas and @MrPerson for help with bitflags.

Thanks @Supersayu for providing a lot of this code.
2014-01-31 15:17:08 +13:00
Razharas
b4f011bacb Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/power/cable.dm

Fixing conflicts
2014-01-31 05:20:59 +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
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
Incoming
5c5cc6a72d Repurposes the outdated BE_MONKEY into BE_BLOB and seperates the alien and blob pools so people can prefer to be one or the other or both or neither. An annoucement should be made when this goes live so people are aware they have a new flag to set.
Adds a dedicated button on the player panel so admins can easily turn specific players into blobs.
2014-01-29 10:54:00 -05: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