Commit Graph

4243 Commits

Author SHA1 Message Date
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
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
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
fleure
5cfb94722d Merge pull request #2548 from Ergovisavi/gibtonite_admin_spam
Stops admins getting spammed by Gibtonite ore when it's on the mining zlevel
2014-01-30 15:03:03 -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
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
bdf57d20a8 Merge pull request #2517 from Jordie0608/worstbuttonever
Removed three useless admin toggle buttons
2014-01-30 10:31:42 -08:00
fleure
74555f6e8d Merge pull request #2546 from Giacom/MiniStation
Ported the MiniStation branch.
2014-01-30 10:24:04 -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
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
bd3c9dea0a Fixes a possible runtime with gibtonite deposits. 2014-01-29 18:10:21 -08:00
Ergovisavi
b7eb807f34 Stops the admins from getting spammed from gibtonite, but is still logged 2014-01-29 15:54:10 -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
Giacomand
7a76e9456b Ported the MiniStation branch.
MiniStation is now a single folder which isn't included by default. When you tick the code file for the ministation map, like with tgstation and metastation, it will then include the necessary code files itself. These code files modify certain datums, like jobs, supply packs and uplink datums.

The modified files outside the MiniStation folder are modifications made by the MiniStation branch which aren't changes exclusive to MiniStation.

Such as changing the unused circulator, which only MiniStation used, so that it was fixed and would correctly match the direction of the thermal generator.
The TEG was also changed to have a better interface and to include the above fix.
The department security was changed so it wouldn't runtime if it didn't find a checkpoint.
The preferences' SetChoices was changed so that the screen would automatically grow for every column in the job list.

The main difference between this version and the forked version is that the Unemployed and the Lieutenant was reverted back to their original names; since it would've been a massive pain to add support for that.
2014-01-29 22:36:10 +00: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
fleure
6908a7194b Merge pull request #2501 from Tenebrosity/fallsounds
Adds sounds to falling over
2014-01-28 11:44:49 -08:00
Robson Richards
859d909a2b Adds sanity checks to Robotlimb repairs 2014-01-28 17:03:25 +00:00
fleure
6568ac61c8 Merge pull request #2516 from metaglog/condiment_fix
Fixes the names of reagents inside condiment bottles.
2014-01-28 03:52:26 -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
Jordie0608
45ee53517a Outright removed toggle admin jump,spawn and revive buttons 2014-01-27 16:10:19 +11: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
484b31ccea Merge pull request #2457 from Giacom/dart_fix
Fixes #2456 and new Add Reagent varedit option.
2014-01-26 11:06:46 -08: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
Jordie0608
8d256558b4 totally didn't forget about this, no siree 2014-01-27 03:28:02 +11:00
Jordie0608
701f195b43 Commented out toggle admin-jump button 2014-01-27 03:15:08 +11:00
metaglog
f0b063bbc4 Fixes the names of reagents inside condiment bottles. 2014-01-26 16:25:33 +01: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
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
5a4441831e Merge pull request #2473 from Giacom/reagent_mix_alpha
Reagents can now mix their alpha color.
2014-01-24 11:53:42 -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