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
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
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
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
a94012b98a
Ports the rapid pipe dispenser (RPD) from /vg/
...
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.
Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03:00
5d2994eb35
Merge pull request #6526 from paprka/secondchef
...
Adds second chef position / Renames chef to cook
2014-12-25 15:30:00 -06:00
591b2f363b
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-25 13:12:46 -08:00
389da595b8
expands the setup options menu
2014-12-25 11:32:47 -08:00
d8b85dda0a
Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
...
refactors narsie
2014-12-24 19:48:24 -08:00
7842ff8803
adds advanced tasers as default
2014-12-24 19:41:40 -08:00
748926a196
Merge pull request #6436 from paprka/sayshit
...
Auto capitalization for most living mob messages
2014-12-24 19:31:32 -08:00
1d1baa96bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-24 18:56:26 -08:00
1e6869bb24
Fixes runtime when usrless placing an item on Ian's head
2014-12-24 18:35:00 +01:00
0862d24a7a
Fixes being able to bite as a monkey with your mouth covered by a mask. Gives a feedback message when unable to bite.
2014-12-24 17:47:23 +01:00
495604228c
Merge pull request #6455 from paprka/bayports
...
Ports manifest / better ready button(s)
2014-12-24 11:54:40 +01:00
690efef0af
Fixes getting sore throat messages while dead.
2014-12-24 02:28:19 +01:00
a9d7266ca2
Merge branch 'master' of https://github.com/tgstation/-tg-station into muh_mobs
2014-12-22 19:55:04 -08:00
2371e2ebd8
renames chef to cook
2014-12-22 17:02:06 -08:00
a89711b6e4
Reverting back to using the recursive get_hearers_in_view proc.
2014-12-22 22:37:16 +01:00
28a23f7dae
Merge pull request #6506 from Menshin/silicons_motion_alarms_fix
...
Fixes AI motion alarms not properly clearing
2014-12-22 10:47:18 -08:00
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
c002d11ee7
Merge pull request #6476 from Cheridan/nightcrawler
...
Refactors snowflake AI hosting in ninja
2014-12-21 17:02:48 -08:00
4a142a0a6b
* Motions alarms will now properly clear for AI (and silicons)
...
* Some code cleaning
2014-12-21 13:29:51 +01:00
aef4ebc006
Allows chemical reactions inside mobs
2014-12-20 19:27:43 -05:00
2481bef95f
Changed the visible_message procs and audible_message procs, they now use the new get_player_mob_hearers_in_view() proc instead of a recursive proc.
...
I removed some duplicated code from tools/tools.dm
Fixed two typos with span class.
2014-12-20 17:29:23 +01:00
Perakp
tkdrg
Thunder12345
Nyvrem
phil235
Swag McYolosteinen
paprka
Cheridan
Remie Richards
Xhuis
hornygranny
MrPerson
Menshin
Ergovisavi
as334