taukausanake
795271048d
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud
2016-06-20 11:23:28 -05:00
TheDZD
12314b64e7
Merge pull request #4349 from VampyrBytes/DatumEmotesMK2
...
Datum Emotes MK II
2016-06-19 14:04:00 -04:00
VampyrBytes
3ace8c09ed
Sorts out ending punctuation
2016-06-19 18:48:43 +01:00
VampyrBytes
6d487a19b7
Sorts out issues raised by Fox & DZD
2016-06-19 18:03:51 +01:00
monster860
3295020088
Merge branch 'master' into ui_plane
2016-06-19 12:38:00 -04:00
VampyrBytes
e346003268
Cancel now cancels the emote, none is an option where applicable
...
As discussed with @Krausus
2016-06-17 00:15:14 +01:00
VampyrBytes
67018f4638
removes full stops
2016-06-16 19:22:40 +01:00
VampyrBytes
b7bc73a692
moar bugfixes
2016-06-15 20:26:09 +01:00
VampyrBytes
ffc01b6ac2
improves command setting
...
thanks @Krausus
2016-06-15 18:56:08 +01:00
FreeStylaLT
f03178c1f2
Reduces stetchist's and suppressor's prices
2016-06-15 02:58:26 +03:00
VampyrBytes
5213682c42
adds buzz2 ( #4561 )
...
adds buzz2, with target and access for simple_animal/bot
2016-06-13 19:51:40 +01:00
VampyrBytes
15ef6c7f46
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2
2016-06-13 18:27:01 +01:00
VampyrBytes
7187a5e8e5
Bugfixes
2016-06-13 18:12:05 +01:00
taukausanake
53a34039da
FUCK
2016-06-11 18:48:47 -05:00
TheDZD
d1f017e684
Merge pull request #4595 from FreeStylaLT/HEAD
...
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
2016-06-11 12:06:59 -04:00
taukausanake
db7b819d1f
Fixes
...
Credit to Monster860 for telling me what I did stupid. HUD still doesn't show however so need to find out that next
2016-06-09 21:36:23 -05:00
taukausanake
130096aced
Hydroponic HUDs
...
Everything is done. Except it doesn't work. I must be missing something somewhere but otherwise I did everything that appeared needing to do. Based it off of mech diag HUD so that might be the issue.
Code as of now does not let you join the server. Need to revert bit by bit and find out what I did wrong
2016-06-09 17:46:09 -05:00
FreeStylaLT
235da61ced
typos
2016-06-08 23:44:17 +03:00
monster860
64ea452f20
Puts UI on it's own plane
2016-06-06 17:12:28 -04:00
FreeStylaLT
a66f7e8f4a
Made it 5 TC instead of 7
2016-06-05 17:56:49 +03:00
FreeStylaLT
42ddf3e8c9
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
2016-06-05 00:14:07 +03:00
TheDZD
f7d4cbe108
Fixes paths, snipers, turrets, mechas, some other things.
2016-05-31 22:50:59 -04:00
TheDZD
8dcf46bf91
Sprites & fixes
2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a
Compiles, and guns work™
2016-05-31 22:50:55 -04:00
Aurorablade
408b19fa7a
foxupdate
2016-05-28 06:15:37 -04:00
Aurorablade
bd5a53a410
maybe fixes atmos tech traitor item...
...
myabe..
2016-05-28 02:04:27 -04:00
VampyrBytes
ac9eac44a1
Adds support for holopad emoting
2016-05-28 05:55:59 +01:00
VampyrBytes
df3b180af4
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2
2016-05-26 12:32:47 +01:00
VampyrBytes
2bd66d8692
Every emote added!
...
Thank god that's over with!
2016-05-26 12:14:52 +01:00
VampyrBytes
0661c05605
tweaks and cleaning
2016-05-26 12:13:29 +01:00
VampyrBytes
5c6474ffc0
Adds better text macro support, default cooldown for emotes with sound and some cleaning
2016-05-18 14:45:14 +01:00
VampyrBytes
97d9831bd9
more tweaks
2016-05-17 11:27:51 +01:00
VampyrBytes
636081e47e
Cleans up message output + bugfixes and tweaks
2016-05-16 22:56:03 +01:00
HugoLuman
718caa3f69
Removes "\The"
...
No more erroneous ``\The``s
I didn't touch all the ``\`` that aren't ``\n`` though, I don't know how or why it's like that or what it would do if I went through and changed it.
2016-05-15 19:48:43 -07:00
HugoLuman
230b220d5c
Addresses https://github.com/ParadiseSS13/Paradise/issues/4434
...
Makes the description for the dehydrated space carp in the syndicate uplink menu more accurate and informative. It now reads:
"Just add water to make your very own hostile to everything space carp. It looks just like a plushie.
The first person to squeeze it will be registered as its owner, who it will not attack. If no owner is registered, it'll just attack everyone."
The previous description did not provide players enough information to use the item correctly.
:cl:HugoLuman
fix: Makes dehydrated space carp description more accurate and informative
/🆑
2016-05-15 17:51:44 -07:00
VampyrBytes
a355f84e1c
Adds default blind and deaf messages + bug fixes
2016-05-14 07:59:21 +01:00
Fox McCloud
3ee2e470a1
Merge pull request #4331 from KasparoVy/voxhair
...
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
2016-05-13 15:36:34 -04:00
VampyrBytes
3de48b83f8
better param support
2016-05-13 10:41:42 +01:00
Tastyfish
b77541bc9b
Fixes a couple runtimes and weird add_reagents/add_reagents_list that was silly
2016-05-12 19:22:07 -04:00
VampyrBytes
29152ceec0
tweaks
...
Better mime support
system returns 0,1 or 2(0 failed, 1 for visible and 2 for audible)
cleaned up creating message
2016-05-11 14:42:05 +01:00
TheDZD
015af5519e
Merge pull request #4391 from Fox-McCloud/objectives
...
TG Traitor Objectives Assignment
2016-05-10 22:41:49 -04:00
KasparoVy
13003fe351
Merge branch 'temp2' into temp
2016-05-10 00:10:15 -04:00
VampyrBytes
0633176893
fixes derps in merge
2016-05-10 04:33:21 +01:00
VampyrBytes
9e0d053143
fixes conflicts
2016-05-10 04:12:55 +01:00
VampyrBytes
bcfe01b038
1st batch of emotes + tweaks
2016-05-10 03:19:00 +01:00
TheDZD
70a2d982f5
Merge pull request #4395 from Fox-McCloud/meme-box
...
His Grace
2016-05-09 19:17:49 -04:00
Fox-McCloud
4d0c3361cc
His Grace
2016-05-08 09:10:25 -04:00
VampyrBytes
a642606d18
fixes bug with species specific emotes
...
Emotes were being allocated before a human's species was set
2016-05-08 09:23:30 +01:00
VampyrBytes
e61d774a7c
Makes emotes case insensitive ( #4386 )
...
Also prevents unconscious emoting
2016-05-08 05:34:31 +01:00
Fox-McCloud
a40460a365
TG Traitor Objectives Assignment
2016-05-07 22:28:57 -04:00
