bgobandit a2241e0f6f Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag ...

Conflicts:
	code/modules/client/preferences.dm
	icons/mob/head.dmi
	tgstation.dme

2015-12-17 20:12:32 -05:00

..

blood.dm

Chemistry rebalances and additions

2015-11-14 22:17:54 -05:00

death.dm

- Fixes shadowling receiving burn messages even when dead. I've also fixed the same bug for other species and made certain spec_life() procs not run when the mob is dead. I also made slime species a subtype of jelly species since they had a lot of code in common thus reducing duplicate code.

2015-10-23 20:00:52 +02:00

emote.dm

Makes emote bans actually work

2015-11-09 10:47:44 -08:00

examine.dm

Chemistry rebalances and additions

2015-11-14 22:17:54 -05:00

human_attackalien.dm

Tweaked values. Added ability to block pounces with shields. Changelog.

2015-09-11 01:29:43 +01:00

human_attackhand.dm

Remove hulk stun punch

2015-12-13 21:49:03 +13:00

human_attackpaw.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

human_damage.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

human_defense.dm

Merge remote-tracking branch 'refs/remotes/tgstation/master' into reactive_expansion

2015-12-12 01:12:59 -06:00

human_defines.dm

Fixes monkeyize/humanize removing the mob's viruses when they should be kept.

2015-09-13 22:52:38 +02:00

human_helpers.dm

- Fixed monkey starting with no dna.

2015-09-19 22:18:28 +02:00

human_movement.dm

Merge pull request #11946 from Lijah99/ACTUALLYFixesVehicleFootprints

2015-09-24 01:22:49 +03:00

human.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag

2015-12-17 20:12:32 -05:00

inventory.dm

Fixes UI stuff

2015-12-09 21:37:18 -06:00

life.dm

Adds tarajan race to the game

2015-11-23 18:48:02 +13:00

login.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

mutantrace.dm

Fixes proc arguments

2015-07-15 23:52:35 +02:00

say.dm

Fixes Player bots moving while deactivated

2015-11-30 14:07:38 +01:00

species_types.dm

Merge pull request #13656 from KazeEspada/Lizardspeech

2015-12-16 21:52:52 +11:00

species.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into lizcannotwag

2015-12-17 20:12:32 -05:00

update_icons.dm

Fixed buckled, handcuffed and legcuffed alert buttons not calling resist.

2015-11-02 18:57:52 +00:00

whisper.dm

radio_controller -> SSradio, SSbp -> SSnpc

2015-12-04 22:25:24 -06:00