df2271c300
Merge pull request #6640 from Nyvrem/master
...
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
48374658a8
Merge pull request #6638 from paprka/beamexplody
...
Fixes disabler beams exploding fuel tanks
2014-12-29 10:37:43 -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
dc6f1895fe
Merge pull request #6608 from paprka/disablerrebuff
...
Reverts disabler nerf
2014-12-29 01:12:52 -03:00
67b32194f1
Merge pull request #6612 from paprka/fixesstamdamprojguns
...
Fixes stamina damage on projectile weapons
2014-12-29 00:57:24 -03:00
1869e9d6ae
reverts c90r stuff
2014-12-28 19:47:54 -08:00
bbc83fed1c
Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy
2014-12-28 18:39:39 -08: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
88a0ee34f4
fixes disabler beams exploding fuel tanks
2014-12-28 03:15:26 -08:00
bf25d38fb2
Merge pull request #6607 from paprka/aiturrets
...
Fixes ai turrets having disable mode instead of stun
2014-12-28 02:21:04 -03:00
c57c75b232
Merge pull request #6604 from paprka/disablerhitsound
...
Disabler now makes a sound when it hits
2014-12-28 02:06:55 -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
ff68a2d55b
Merge pull request #6490 from tkdrg/nomoreadmingrudges
...
Adds cfg option to let players see their own notes
2014-12-27 19:25:43 -08: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
4205b8d531
Merge pull request #6620 from Menshin/missed_designs
...
Fixes missing designs for the protolathe construction
2014-12-27 20:35:08 +01:00
cc474b2af6
Merge pull request #6591 from phil235/FingerlessSpriteFix
...
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03: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
faf5a1dd07
Fixes #6547
...
Shortening a shotgun now uses proper grammar, and displays the original
name of the shotgun for the finish message:
"X shortens the improvised shotgun"
instead of:
"X shortens the sawn-off improvised shotgun"
2014-12-27 18:19:04 +00:00
7f7fad7ac9
Merge pull request #6586 from phil235/ResonatorTableFix
...
Fixes the resonator being activated when placed on a table/closet/storage
2014-12-27 15:06:36 -03:00
f8b7a2066f
Merge pull request #6559 from tkdrg/hal
...
Adds sanity checks to supermatter Consume()
2014-12-27 18:42:01 +01: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
9d430e1470
Done some missed designs for the R&D revamp.
2014-12-27 16:49:11 +01:00
1846489593
Merge pull request #6589 from phil235/SiliconPunchMsgFix
...
Fixes message typos
2014-12-27 11:48:54 -03:00
e00a1b0806
Merge pull request #6572 from paprka/fixescargo
...
Removes broken tactical helmets crate
2014-12-27 09:45:11 -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
8a9d7b12c4
Change the spacing.-For Cheridan
2014-12-27 02:09:07 -05:00
a3e70b3cf2
Prevents certain chemical reactions occuring in mobs.
2014-12-27 01:38:31 -05:00
87d0cbdb2b
Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo
...
Conflicts:
code/modules/clothing/head/helmet.dm
2014-12-26 22:31:54 -08:00
5fb8ae35b4
removes tactical helmets
2014-12-26 22:30:24 -08:00
45904bb8a2
Merge pull request #6425 from JJRcop/OOCemoji
...
Adds emoji to OOC chat [Now with in-house sprites!]
2014-12-27 03:01:36 -03: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
ad188e2e4d
additional buff
2014-12-26 21:00:13 -08:00
69c22e99a9
reverts disabler nerf
2014-12-26 20:53:53 -08:00
ef1d60061b
fixes ai turrets having disabler modes
2014-12-26 20:52:21 -08:00
19f9da1a99
disabler now makes a sound when it hits
2014-12-26 20:29:52 -08:00
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08: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
344142634e
Merge pull request #6518 from TZK13/Chocolate-Food
...
Adds three new food items made with chocolate bars
2014-12-27 00:55:42 +00:00
17f1e7f044
Merge pull request #6516 from paprka/suitcensorsv2v2
...
Tweaks suit sensor menu to be easier to use
2014-12-27 00:37:47 +00: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
tkdrg
Thunder12345
paprka
Nyvrem
Ergovisavi
phil235
Swag McYolosteinen
phil235
Menshin
Cheridan
as334
Remie Richards
Xhuis