Mars
fe7991da68
Revert man up message change
2018-04-13 13:27:26 +02:00
Mars
9162507c93
Makes single Man Up give the same message to that person as the global.
2018-03-22 11:12:56 +01:00
Mars
8be770ed5d
Icon is named pill, not pills
2018-03-20 18:19:45 +01:00
Fox McCloud
53bb5eaf35
Vulp Hunger Hotfix
2018-03-19 19:37:35 -04:00
tigercat2000
50f9d695a5
Merge pull request #8124 from Aurorablade/Dreams
...
Byond the wall of sleep
2018-03-19 13:42:00 -07:00
tigercat2000
5a756ad3c9
Merge pull request #8708 from Birdtalon/nanocalcium
...
Nanocalcium: Bone repair drug.
2018-03-19 13:37:20 -07:00
tigercat2000
6f5a666b1a
Merge pull request #8284 from Aurorablade/CultPassBug
...
Cult pass split: Bugs and runes
2018-03-19 13:28:36 -07:00
shazbot194
0a9a3c2b2b
More icons for the M90 ( #8738 )
2018-03-19 13:20:31 -07:00
tigercat2000
de46e81793
Merge pull request #8775 from Birdtalon/take
...
Re-adds "Take" shortcut into admin help
2018-03-19 11:29:09 -07:00
tigercat2000
cd6b8dfe45
Merge pull request #8566 from Aurorablade/BuffsVulpkanin
...
Tips the Scales
2018-03-19 11:27:35 -07:00
Birdtalon
f7d96d8cfe
re-adds take shortcut into adminhelp
2018-03-19 11:27:21 +00:00
Aurorablade
2e74bcd4d5
Why this no commit?
2018-03-19 02:05:37 -04:00
Aurorablade
6aec682631
Diona needing water revert
...
Still have hair.
2018-03-19 02:05:16 -04:00
Aurorablade
737a1575ff
NYAH
2018-03-19 01:44:48 -04:00
Aurorablade
13212ee27c
Style Tweaks
2018-03-18 23:44:38 -04:00
Aurorablade
59cbd79cc3
Fine, no typo
2018-03-13 22:31:27 -04:00
Aurorablade
2a3dd305a9
Obscure Admin Related fixes
2018-03-13 22:22:51 -04:00
tigercat2000
4a01ed097d
Merge pull request #8750 from PigeonLord/food
...
I changed the taste description of a few food items
2018-03-13 04:56:42 -07:00
Terilia
28806f8fd5
Merge remote-tracking branch 'upstream/master' into terifluff
2018-03-13 05:20:20 +00:00
Terilia
ae88de8669
Trying to solve the merge conflicts.
2018-03-13 04:50:25 +00:00
Fox McCloud
96fc4aba1c
Merge pull request #8671 from Aurorablade/PodFluff
...
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
Piccione
06fa27ac28
I changed the taste description of a few food items
2018-03-10 21:48:55 +01:00
tigercat2000
fce0f75eb1
Merge pull request #8741 from shazbot194/Desolate_Fluff
...
Desolate's fluff name fix, no longer dancing fluff item
2018-03-07 22:47:49 -08:00
shazbot194
413118d1b4
Removes the dance machine
2018-03-07 15:30:40 -09:00
Tad Hardesty
1ca410b91e
Fix various syntactic problems
2018-03-06 23:19:39 -08:00
shazbot194
79539cc0ea
Name and Description change
...
I forgot to ask Desolate what he wants, here is the fix for that
2018-03-06 22:18:17 -09:00
shazbot194
cc5d9bc31e
Adds in Desolate's dance machine button
2018-03-06 22:10:12 -09:00
tigercat2000
add4852d3c
Remove purple rose properly
2018-03-06 04:46:17 -08:00
Regen
ff68c12b31
Removes purple hair flower pin
...
Removes the purple hair flower pin, as this is my fluff item.
@Tigercat2000 is moving the sprite to the correct folder then he's available.
:CL: Regen
rscdel: Removes the purple hair flower pin from loadout and general player access, because this is a fluff item.
/:CL:
2018-03-06 01:36:10 +01:00
Funce
27d3ccbe10
Allow silicons to properly use interface lock UI.
2018-03-05 11:48:40 +13:00
Aurorablade
a7d027cef6
mrowl
2018-03-03 23:39:35 -05:00
Fox McCloud
e1003f0d83
Merge pull request #8489 from KasparoVy/eyeglow
...
Eyes of Humanoids w/ Great Darkview, XRAY Vision, Synthetic Eyes or Eye Implants Shine in the Dark
2018-03-03 17:20:52 -05:00
tigercat2000
693e188362
Merge pull request #8583 from FalseIncarnate/coffee
...
Coffee Mugs and Vendor Change
2018-03-03 10:32:54 -08:00
FalseIncarnate
3b37c1c48c
datum path rename
2018-03-03 13:19:58 -05:00
tigercat2000
2887c4a62f
Merge pull request #8710 from Birdtalon/pschye-toys
...
A few more things for the Psyche locker.
2018-03-03 09:59:40 -08:00
tigercat2000
65f0895b64
Merge pull request #8693 from Aurorablade/NecaWTF
...
Why Neca
2018-03-03 09:59:22 -08:00
tigercat2000
d92616c948
Merge pull request #8660 from Tayyyyyyy/ai_status
...
Port tg AI status panel
2018-03-03 09:59:06 -08:00
tigercat2000
aca2769324
Merge pull request #8681 from DarkPyrolord/BluespaceSlices
...
Fixes bluespace bread (and other slice foods as well)
2018-03-03 09:30:23 -08:00
tigercat2000
087457fa9b
Merge pull request #8675 from Serkket/001
...
Bug-B-Gone
2018-03-03 09:28:12 -08:00
Citinited
8d559ab9b3
fixes posibrains going to nullspace after losing at russian roulette
2018-03-02 21:44:58 +00:00
Citinited
c6cc30ff8c
Fixes a runtime that can be caused by headless IPCs
2018-03-02 21:39:48 +00:00
Aurorablade
0e558f5b51
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BuffsVulpkanin
2018-03-01 19:55:48 -05:00
Aurorablade
a3b23f29d6
itMerge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultPassBug
2018-03-01 19:51:05 -05:00
FalseIncarnate
060117f5c3
novelty datums
2018-02-28 22:13:38 -05:00
Birdtalon
7283431211
descriptions updated by request
2018-02-27 15:13:41 +00:00
tigercat2000
b8b5795636
Merge pull request #8704 from Aurorablade/SkrellHair
...
New hair for Skrell and one for Taja
2018-02-24 19:19:23 -08:00
Birdtalon
904131be1e
some more toys for psyche
2018-02-23 13:48:08 +00:00
Birdtalon
aa31461979
adds sound effect, reformats guide
2018-02-22 19:14:56 +00:00
Birdtalon
908d2ae53a
addresses reviews - remove redundancies, changes some spans
2018-02-22 10:54:29 +00:00
Aurorablade
86f25c5e7f
fixes some words...
2018-02-21 23:31:43 -05:00
