8e8b761ae2
Merge pull request #6716 from psykzz/patch-2
...
Refactor Ears self healing
2015-01-01 17:18:08 -03:00
be85bb6d17
Merge pull request #6707 from phil235/HostileAttackingTargetFix
...
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
2015-01-01 12:47:27 -03:00
7e48be5be0
Merge pull request #6686 from paprka/lizstutterv2
...
Removes lizard stuttering
2014-12-31 23:22:38 -03:00
a9203dcc66
Updating ear code from humans.
...
Keeping it together.
2014-12-31 21:57:25 +00:00
9bdc62fae3
Fixing initial ear_damage
...
Was missing a 0.
2014-12-31 21:35:23 +00:00
1f8c748309
Refactor Ears self healing
...
Aims to fix #291
2014-12-31 21:09:35 +00:00
cdb5066502
Merge pull request #6324 from Razharas/GenShit
...
Added datum mutations
2014-12-31 17:24:15 -03:00
286a9ce4bc
Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix
...
All sec HUDs work properly with examine buttons
2014-12-31 15:45:40 +01:00
27d8c489ee
Fixes carp, mimic and tree nog being able to knockdown their target.
...
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
Fixes player controlled hostile simple animal's ranged attack targeting the target from their previous melee attack instead of the target clicked.
2014-12-31 15:01:23 +01:00
cfff3cd375
Merge pull request #6539 from Xhuis/pounce_nerf
...
Nerfs alien hunter pounce
2014-12-31 02:29:15 +01:00
ff173b82b1
Merge pull request #6656 from Ergovisavi/mushroom_samba
...
Fixes mushrooms preying on non mushrooms
2014-12-30 21:35:46 -03:00
1c88fbf615
Adds 3-second cooldown to alien hunter pounce; only triggers if successful
2014-12-30 18:19:35 -05:00
26fb835323
removes lizard stuttering
2014-12-30 10:04:50 -08:00
d1f347f584
Fixes conflicts
...
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
ee3617310e
Merge remote-tracking branch 'upstream/master' into droneFix
2014-12-30 13:32:51 +02:00
df2271c300
Merge pull request #6640 from Nyvrem/master
...
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
f286d2602b
Fixes mushrooms not being cannibals only
2014-12-29 07:28:30 -08:00
9276e43e6e
Fixes eyepatch and night vision HUDs not working with examine sec record buttons
2014-12-29 18:23:47 +04:00
f7e6552e33
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
2014-12-29 17:05:20 +03:00
80cc2d4100
Merge pull request #6622 from Thunder12345/grammarFixes
...
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
d7dd967c34
Simplification
...
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
2014-12-29 11:35:48 +00:00
10b21b20ab
Conflicts resolution
...
In items weapons melee misc
2014-12-29 11:49:30 +03:00
418e3a0613
General cleanup
...
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
ad2fee37be
Merge pull request #6625 from phil235/HalluAttackAnimationFix
...
Fixes hallucinated attackers not doing the attack animation.
2014-12-29 01:56:19 -03:00
67b32194f1
Merge pull request #6612 from paprka/fixesstamdamprojguns
...
Fixes stamina damage on projectile weapons
2014-12-29 00:57:24 -03:00
05a1cadac3
Preferred colours for podpeople
...
Make podpeople use preferrence colours instead of being grey with black eyes.
2014-12-28 18:39:20 +01:00
76a21883a8
Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
...
Conflicts:
code/game/mecha/mecha.dm
code/game/objects/structures/tables_racks.dm
code/modules/mob/living/silicon/silicon.dm
code/modules/projectiles/gun.dm
Fixes dem conflicts
2014-12-28 11:20:15 +03:00
208b59c30e
Fixed stuff tkdrg pointed out
...
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
60fc73d018
Merge pull request #6587 from phil235/MonkeyBiteMaskFix
...
Fixes being able to bite as a monkey with your mouth covered by a mask.
2014-12-28 01:01:14 -03:00
3994ac3f48
Fixes hallucinated attackers not doing the attack animation.
...
Fixes lack of attack animation, sound and attack cooldown when the human mob attacks the hallucinated attacker.
Removes some commented code and some duplicated checks.
Reorganized the hallucination procs a bit.
2014-12-27 22:41:13 +01:00
744940c8a8
Fixes #6615
...
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
2014-12-27 18:32:45 +00:00
d1efc0c002
Fixes #6548
...
Simple animal friendly attacks (Ones that do no damage) now use the
notice span class, to match hugging.
2014-12-27 17:27:55 +00:00
1846489593
Merge pull request #6589 from phil235/SiliconPunchMsgFix
...
Fixes message typos
2014-12-27 11:48:54 -03:00
7ee2317ec3
Merge pull request #6207 from phil235/RecursiveHearVisibleMessage
...
Mob inside something can now see visible_message()'s
2014-12-27 13:20:50 +01:00
5dedde8ea2
fixes c90 and the stam dam update issue
2014-12-27 03:19:26 -08:00
33177a17ac
fixes stamina damage on projectile weapons
2014-12-26 23:37:12 -08:00
cededeaa8e
Merge pull request #6498 from as334/MobReactions
...
Allows chemical reactions inside mobs
2014-12-27 01:20:18 -06:00
fc7c7b520d
Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
...
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
82588d43bf
Merge pull request #6347 from Xhuis/bzzzt
...
Shocking animations
2014-12-27 05:23:09 +00:00
9ba34b32e6
Fixes return() borking the code
2014-12-27 00:17:57 -05:00
8acded6304
Merge pull request #6278 from Ergovisavi/muh_mobs
...
Mob faction cleanup / Some goliath changes / Hopefully fixing some lag
2014-12-26 23:23:48 -03:00
f07b250dde
Removes old comments and does damage immediately
2014-12-26 21:08:43 -05:00
188b85ae48
Merge pull request #5641 from MrPerson/autoghosting
...
Moving while dead causes you to ghost
2014-12-26 21:35:58 -03:00
615f3f3488
Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd
...
Conflicts:
code/modules/mob/living/damage_procs.dm
code/modules/projectiles/projectile.dm
2014-12-26 16:14:19 -08:00
84649dacd4
Merge pull request #6339 from tkdrg/rip'd
...
Ports the rapid pipe dispenser (RPD) from /vg/
2014-12-26 23:58:17 +00:00
08d36580ba
Merge pull request #6561 from paprka/manifestfixes
...
Expands the new player options menu
2014-12-26 13:22:24 -06:00
5c8a8b5dca
Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
...
Conflicts:
icons/mob/head.dmi
icons/mob/suit.dmi
icons/obj/clothing/hats.dmi
icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08:00
8a56892892
Fixes message typos in silicon punch message, mecha construction description, message when taking blood sample.
2014-12-26 12:13:54 +01:00
7445f27348
Merge pull request #6546 from Menshin/ian_place_hat_fix
...
Fixes runtime when usrless placing an item on Ian's head
2014-12-25 21:26:55 -08:00
dbaa0ca291
Merge pull request #6542 from phil235/SoreThroatFix
...
Fixes getting sore throat messages while dead.
2014-12-25 21:26:38 -08:00
tkdrg
Matt Smith
phil235
phil235
Xhuis
paprka
Razharas
Perakp
Ergovisavi
Lo6a4evskiy
Thunder12345
Nyvrem
Swag McYolosteinen
Cheridan
Remie Richards
hornygranny