cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-24 01:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,597 Commits 26 Branches 2 Tags
f7dcde22d781fd0bc0db35b51cd168b53075dba9
Commit Graph

411 Commits

Author SHA1 Message Date
FalseIncarnate
3c03834571 Benjaminfallout Fluff Item 
Adds Benjaminfallout's fluff item: a personalized ring.

Ckey: `benjaminfallout`
Character Name: `Pretzel's Ring"

![ring image](https://i.gyazo.com/b709324b79e2845cae16eb305d7d5cc3.png)

Approved by Kyet
 2019-03-22 23:14:52 -04:00
Couls
cc7d2606be Update shesi's fluff sprites and add in a custom winter hood to go with the coat 2019-03-12 18:24:04 -04:00
rb303
f1716ed14a fixes conflicts 2019-03-11 02:55:21 +00:00
rb303
26bcfacf2a Fluff Item 2019-03-08 17:49:34 +00:00
Aurorablade
ca629f4bd3 Pinapplehairfluff 2019-03-04 22:10:22 -05:00
AffectedArc07
db6629387c Fluff Item 2019-03-01 19:35:47 +00:00
datlo
1caaa600ae add greey's fluff duffel 2019-02-12 00:30:36 +00:00
datlo
9bea70dd49 add comfy coat 2019-02-11 10:56:14 +00:00
Gwydion Brain
29a3a25ae6 Merge remote-tracking branch 'ParadiseSS13/master' into flatline_partner_fluff 2019-02-08 19:13:51 -08:00
Gwydion Brain
6a59bb52a3 Auto stash before rebase of "ParadiseSS13/master" 2019-02-08 16:26:04 -08:00
Fox McCloud
b29fed6bf9 Fox Fluff Item Coat 2019-02-08 17:11:59 -05:00
lass9030
8b666c84c1 fluff suit 2019-02-07 03:52:55 +01:00
Fox McCloud
5fce6edc0d Skittles Fluff Item--Kiachi 2019-02-02 18:52:43 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Ionward
14d23a7eb2 ionward_fluff_labcoat 2019-01-27 19:09:04 -08:00
datlo
e7eef0bf42 Fix bluespace bunny ears fluff desc 2019-01-26 00:53:02 +00:00
Gwydion Brain
cc05eda75e Merge branch 'master' into CheekyCrenando_Fluff_coat 2019-01-25 13:13:20 -08:00
Gwydion Brain
b1683380c9 Cheeky's Fluff item 
I sold my soul to CM and they won't give it back :(
 2019-01-24 01:01:55 -08:00
Aurorablade
fb89274c6d PineappleSaladFluff 2019-01-22 20:26:47 -05:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
c5af806268 Asmerath Fluff item, Accordion inhands 2019-01-13 00:53:53 -05:00
Unknown
8cb30b7996 Decemviri's fluff hardsuit modkit 2018-12-18 23:00:15 +01:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefined
5c72537d8c Fixes merge conflicts 2018-11-14 09:21:21 +08:00
variableundefined
7544ae573f Add in squeak component and refactor mouse, bikehorn, clown suit to use it. 2018-11-04 14:17:45 +08:00
Gwydion Brain
1f6613c289 Initial 2018-11-02 13:31:25 -07:00
Desolate
f7627d2fcb Resolves conflicts. 2018-10-11 05:36:22 -05:00
Gwydion Brain
57debc2eb8 Merge branch 'master' into thatdanguy23_fluff_t2 2018-10-10 10:52:04 -07:00
Crazy Lemon
6b846a81c1 Merge pull request #9664 from Agameofscones/rsiksfluffitem 
Rsik's Fluff Item
 2018-10-08 01:11:28 -07:00
Gwydion Brain
1d992e4e70 Grammar Sillies 2018-10-06 22:16:20 -07:00
Gwydion Brain
82dc6ce32f Item Revamp 2018-10-06 22:09:09 -07:00
Gwydion Brain
9a02501acc Initial 2018-10-06 21:29:57 -07:00
Purpose
63dfd411aa Resolved merge conflicts... I hope. 2018-10-06 16:01:34 +01:00
Desolate
4c062212ab refactors global lists. 2018-10-06 08:02:45 -05:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Gwydion Brain
2a0b657c9a Merge branch 'master' into rsiksfluffitem 2018-10-01 11:40:01 -07:00
Gwydion Brain
d891504ea2 Initial 2018-10-01 11:24:26 -07:00
Aurorablade
4973f0d7f2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FlagBearerFluff 2018-09-29 23:30:04 -04:00
Purpose
c82cd93a89 Merge branch 'master' into Refactors-beds-stools-chairs 2018-09-29 15:36:27 +01:00
DarkPyrolord
2eeccc0c48 TigerFixes 2018-09-29 13:10:01 +12:00
DarkPyrolord
c04f3b7f74 NameFix 2018-09-28 22:54:06 +12:00
DarkPyrolord
dd9cbb861d WinterSec 2018-09-28 22:42:38 +12:00
SkeletalElite
238f2db483 Requested Changes and Conflicts 2018-09-27 18:27:13 -07:00
SkeletalElite
7e4774416a Requested Changes 2018-09-27 18:00:45 -07:00
variableundefined
1a7461fab7 Actually fixes conflicts! 2018-09-27 17:39:28 +08:00
SkeletalElite
37ed27f84b Merge branch 'master' into Fluff 2018-09-16 17:20:17 -07:00
Crazylemon64
dadac2c755 E.L.O.'s fluff item 2018-09-14 19:37:27 -07:00
Crazy Lemon
85e35bcba9 Merge pull request #9484 from BottomQuarks/BottomQuark_Fluff_Item 
Bottom quark fluff item
 2018-09-14 18:14:16 -07:00
Purpose
efbcd54cf2 Fully refactors Chairs, Stools & Beds. Adds a few fun bits 2018-09-14 18:40:42 +01:00
SkeletalElite
5afe9b079c Sprite Code 2018-09-08 14:27:33 -07:00