Anewbe
d9572c6998
Merge pull request #2932 from Anewbe/mask_action_button
...
Breath mask action button
2017-01-17 23:20:58 -05:00
Anewbe
6827f81b37
Merge pull request #2933 from Anewbe/robot_vomit
...
Tweaks some emotes
2017-01-17 23:20:45 -05:00
Anewbe
d53cfc4773
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
...
# Conflicts:
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
# icons/mob/human_face.dmi
# icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Neerti
14c67e0893
Two bugfixes
...
Ghosts should be able to hear things once more.
The big bold NEW NEWS notice should remember if one has already seen the news, as the hash was not actually being saved. It's being saved now.
2017-01-17 04:11:57 -05:00
Spades
3cda1a9bd3
Merge pull request #839 from VOREStation/langfix
...
Further language implant fix
2017-01-17 01:10:38 -05:00
Cameron653
93351c47af
Merge branch 'master' into master
2017-01-16 22:30:45 -05:00
Anewbe
5b1fc48712
Ports Bay's character resets
2017-01-16 19:02:41 -06:00
Anewbe
e63176c2e6
Tweaks some emotes
2017-01-16 18:48:00 -06:00
Anewbe
c805befca6
Breath mask action button
2017-01-16 18:14:35 -06:00
Anewbe
9cbee4baf4
Ports taste
2017-01-16 17:07:41 -06:00
Arokha Sieyes
243a732a33
Fixes Verin's trenchcoat
...
Forgot some lines and it should have been fluff path anyway
2017-01-16 16:12:10 -05:00
Arokha Sieyes
e4b6ace4d5
Further language implant fix
...
It just can't be a child of the other language implant at all.
Fixes #838
2017-01-16 15:33:01 -05:00
Cameron653
300dd33e51
Fixes the floorlength braid... again
2017-01-16 15:07:27 -05:00
killer653
712f5610fb
Wickedtemp custom items
...
Adds a fixed sprite for Wickedtemp's health hud
Adds a custom taur sprite for Wickedtemp
2017-01-16 00:45:30 -05:00
Anewbe
3b95575da6
Merge pull request #2924 from Anewbe/language_things
...
Bay Ports, mostly Languages
2017-01-15 18:53:54 -05:00
Anewbe
eefc096561
Merge pull request #2913 from Anewbe/plasmastun
...
Plasma Pulse Stunner
2017-01-15 18:53:44 -05:00
Anewbe
0f4fbab0be
Merge pull request #2928 from Anewbe/slimebaton
...
Xenobio fixes
2017-01-15 18:53:26 -05:00
Anewbe
c2ac804dc0
Implements the vacuum traversal part of the plasmastun
2017-01-15 17:42:05 -06:00
Anewbe
fea374d77e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into plasmastun
2017-01-15 17:27:21 -06:00
Anewbe
73bbe1355e
Merge pull request #2927 from Anewbe/teshari_hearing
...
Teshari tweaks
2017-01-15 18:26:58 -05:00
Anewbe
b2aa116e29
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into plasmastun
2017-01-15 17:19:47 -06:00
Anewbe
4521a6a2c0
Merge pull request #2922 from Anewbe/crate_event
...
Ports Bay's Shipping Error event
2017-01-15 18:17:02 -05:00
Anewbe
7cd24d6c92
Merge pull request #2917 from Anewbe/carp
...
Space carp have a chance to stick around after their events
2017-01-15 18:16:54 -05:00
Anewbe
a379aa2779
Merge pull request #2911 from Anewbe/taj_chems
...
Applies various chem changes to Tajaran
2017-01-15 18:16:34 -05:00
Anewbe
8893640a42
Merge pull request #2920 from Anewbe/boot_knives_again
...
Tweaks the way bootknives work
2017-01-15 18:16:24 -05:00
Anewbe
93a3976ce1
Merge pull request #2919 from Anewbe/sifguard
...
Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard)
2017-01-15 18:15:04 -05:00
killer653
832418c7c9
Polaris sync
2017-01-15 18:12:15 -05:00
Arokha Sieyes
4e1dd1d237
Merge pull request #835 from VOREStation/arosuit
...
Event medic suit
2017-01-15 17:21:08 -05:00
Arokha Sieyes
7dd40a12be
Event medic suit
...
Basically a medic suit for me for events or gateway missions or whatever. Doesn't spawn.
2017-01-15 17:10:42 -05:00
Anewbe
72ece31fa9
Xenobio fixes
2017-01-15 14:59:33 -06:00
Anewbe
d16f09749d
Merge pull request #2918 from Neerti/1/14/2017_minor_mic_circuit_fix
...
Fixes Small Bug in Microphone/EPv2 Circuit
2017-01-15 14:41:37 -05:00
Spades
34ef727794
Merge pull request #830 from VOREStation/ealimplant
...
Fix language/EAL implant.
2017-01-15 14:24:54 -05:00
Spades
b0a98c173d
Merge pull request #829 from VOREStation/verin
...
Verin Fluff Coat
2017-01-15 14:23:34 -05:00
Anewbe
3852ac1e22
Teshari Tweaks
2017-01-15 01:21:48 -06:00
Anewbe
46486249f0
Makes the automute less strict on timing
2017-01-14 23:06:24 -06:00
Anewbe
2d72e609d1
Moves languages to use more defines. Redoes Diona splitting
2017-01-14 22:47:12 -06:00
Anewbe
4b9258afbf
Ports Bay's Shipping Error event
2017-01-14 18:34:34 -06:00
Anewbe
00dfa331f3
Renames SCG Expeditionary Corps to Sif Homeguard Corps (SifGuard)
2017-01-14 18:06:31 -06:00
Anewbe
80901d6c23
Tweaks the way bootknives work
2017-01-14 17:12:21 -06:00
Anewbe
d14096148a
Adjusts removed, rather than strength for Taj things
2017-01-14 15:20:50 -06:00
MagmaRam
1351e5b013
Merge pull request #2890 from Anewbe/chem_spills
...
Fixes phoron/fuel spills not affecting the spilled-upon mob
2017-01-14 14:39:08 -06:00
Neerti
58b1b16be9
Also fixes EPv2 circuit not pushing data.
...
Also makes code compile.
2017-01-14 14:04:19 -05:00
Neerti
fadec38c59
Fixes Small Bug in Microphone Circuit
...
Microphone circuits should push data properly.
2017-01-14 13:52:34 -05:00
Arokha Sieyes
6cf76748eb
Fix language/EAL implant.
...
Polaris added an item with the exact same path, hence the weird behavior of the EAL implant teaching you every language. Two items with the same path = weirdness. Should be better now.
2017-01-14 02:32:02 -05:00
Anewbe
aa91f86845
Space carp have a chance to stick around after their events
2017-01-14 00:34:15 -06:00
killer653
6f66241fe5
Better fix proposed by Aronai
2017-01-13 20:32:23 -05:00
Arokha Sieyes
7bb0b8fc5f
Verin Fluff Coat
...
Credit to Yosh for coding and providing the .diff for it. I just added a comment and put in the custom_items.txt change.
2017-01-13 19:53:40 -05:00
killer653
21cb9d3746
Changes it to Aronai's more efficient way
2017-01-13 19:31:24 -05:00
killer653
6728441d5c
Prevents accidental stomach flavor text deletion
2017-01-13 19:12:04 -05:00
Anewbe
3066d280ec
Adds Neerti's proposal to the plasmastun thing
2017-01-13 16:18:05 -06:00