 Fox McCloud
|
5c4aa9b3fd
|
Removes All Weapons
|
2018-04-15 16:25:56 -04:00 |
|
|
Fox McCloud
|
8c5992f1e6
|
Fox Fluff Item
|
2018-04-12 17:23:09 -04:00 |
|
|
shazbot194
|
4b03a9abba
|
Second fix part 1
|
2018-03-24 16:41:14 -08:00 |
|
|
shazbot194
|
a3183ee485
|
Upadates Patch's Jacket icons and adds some more colors
|
2018-03-23 17:42:59 -08:00 |
|
|
shazbot194
|
3b1783fe66
|
Second merge fix part one
|
2018-03-20 21:16:20 -08: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 |
|
|
shazbot194
|
413118d1b4
|
Removes the dance machine
|
2018-03-07 15:30:40 -09: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 |
|
|
GunDOSMk1
|
337d95c23a
|
Adds Norsteads Fluff
|
2018-02-25 21:20:43 +00:00 |
|
|
Terilia
|
252eccd7e0
|
Forgot to add the Char Name and Ckey
|
2018-02-20 14:21:49 +00:00 |
|
|
Terilia
|
f2bc71a3f8
|
Fluff Item Bikehorn
A new bikehorn for Toodles. Buyers beware.
|
2018-02-11 15:03:28 +00:00 |
|
|
Aurorablade
|
11872315ee
|
tiger changes
|
2018-02-10 00:45:55 -05:00 |
|
|
Aurorablade
|
3bdecb4e54
|
spacepodfluff
|
2018-02-09 22:34:17 -05:00 |
|
|
Aurorablade
|
b43875d497
|
TRUE
|
2018-01-06 23:15:13 -05:00 |
|
|
Aurorablade
|
4c20790208
|
blue apprently..
|
2018-01-06 21:17:39 -05:00 |
|
|
Aurorablade
|
70963a8a42
|
he is floffy fluffy
|
2018-01-06 20:38:13 -05:00 |
|
|
GunDOSMk1
|
3aee4a9da4
|
Adds Dethamos's fluff (For real this time) (#8450)
* Adds item defines for Denthamos's fluff.
* Adds Denthamos's fluffs suit sprites.
* Adds sprite for Denthamos's fluff ite,
* Fixes Denthamos's Fluff
* Fixes Denthamos's fluff defines.
|
2017-12-23 18:38:31 -08:00 |
|
|
Aurorablade
|
53d63a29f8
|
i thought i commited this...
|
2017-10-08 18:37:34 -04:00 |
|
|
Aurorablade
|
73b0f32927
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-10-07 22:46:57 -04:00 |
|
|
FlattestGuitar
|
86d846dec5
|
More fixes.
|
2017-09-11 22:26:43 +02:00 |
|
|
FlattestGuitar
|
81f5ea440f
|
Merge branch 'master' into more-fluff
# Conflicts:
# icons/obj/custom_items.dmi
|
2017-09-11 22:25:54 +02:00 |
|
|
HugoLuman
|
a1f154eb0f
|
Adds a patreon fluff item to the game.
Signed-off-by: HugoLuman <qaggeler@uci.edu>
|
2017-09-07 19:57:11 -07:00 |
|
|
FlattestGuitar
|
46a35e0535
|
Fei and Anxipal fluffs
|
2017-09-05 13:47:40 +02:00 |
|
|
Aurorablade
|
df3d13ad7d
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-09-02 22:49:05 -04:00 |
|
|
Aurorablade
|
9956a4a90a
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-08-23 17:37:22 -04:00 |
|
|
FlattestGuitar
|
1759adc852
|
No more warden coat
|
2017-08-22 11:30:07 +02:00 |
|
|
FlattestGuitar
|
408ceffab4
|
Conflicts
|
2017-08-12 11:07:12 +02:00 |
|
|
FlattestGuitar
|
165a468ff0
|
tigerfixes
|
2017-08-12 11:03:34 +02:00 |
|
|
FlattestGuitar
|
2314d1b0cc
|
Fluffs for Desolate, Hylocereus, Shazbot
|
2017-08-09 18:34:31 +02:00 |
|
|
Aurorablade
|
8e5f3102ff
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-07-31 17:20:30 -04:00 |
|
|
FlattestGuitar
|
15f4b53cc5
|
unblocks hair?
|
2017-07-22 14:28:56 +02:00 |
|
|
FlattestGuitar
|
bc68d0a253
|
Fluff item for Valkyrie
|
2017-07-18 12:49:53 +02:00 |
|
|
tigercat2000
|
70b808a36e
|
Merge pull request #7728 from Xantholne/HoodieFluff
Xantholne Wintercoat Fluff
|
2017-07-10 13:28:42 -07:00 |
|
|
tigercat2000
|
a4159745ef
|
Merge pull request #7694 from Fox-McCloud/instruments
Instruments Refactor and Electric Guitars
|
2017-07-10 13:24:52 -07:00 |
|
|
Xantholne
|
fe5ba13ffd
|
Removes the cold protection stufff
|
2017-07-10 07:22:18 -06:00 |
|
|
Xantholne
|
bf1310204e
|
Xantholne Wintercoat Fluff
|
2017-07-06 04:50:46 -06:00 |
|
|
Fox-McCloud
|
0b8e61e2cc
|
Instruments Refactor and Electric Guitars
|
2017-07-02 03:52:42 -04:00 |
|
|
Fox-McCloud
|
05a24da2e8
|
The Most Non-Edgey PR Ever
|
2017-07-01 19:48:43 -04:00 |
|
|
Aurorablade
|
818f9a0f40
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-06-28 22:10:08 -04:00 |
|
|
tigercat2000
|
88430f4e3d
|
Merge pull request #7507 from FlattestGuitar/midnight-fluffles-v2
fluff items for Birdtalon and Ssscratches
|
2017-06-27 13:09:37 -07:00 |
|
|
Aurorablade
|
d6434bef1b
|
morefeedback
|
2017-06-22 19:20:29 -04:00 |
|
|
Aurorablade
|
445fe41471
|
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff
|
2017-06-15 00:25:05 -04:00 |
|
|
Sam
|
7c7c8c70cb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines
|
2017-06-10 10:16:33 +01:00 |
|
|
Sam
|
4d57fff5c9
|
Updates Intents
|
2017-06-10 09:43:36 +01:00 |
|
|
FlattestGuitar
|
b1666b4bbf
|
fluff items for Birdtalon and Ssscratches
|
2017-06-08 22:59:28 +02:00 |
|
|
Aurorablade
|
30178c2057
|
i need to memorize defines...
|
2017-06-06 09:31:21 -04:00 |
|