cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,790 Commits 26 Branches 2 Tags
08bbbbfed028203a5b1c19dd73e18550deda79be
Commit Graph

311 Commits

Author SHA1 Message Date
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
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
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
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
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
Sam
c1cc319f62 Uses more intent defines 2017-06-03 18:29:50 +01:00
FlattestGuitar
ce5d7eccdb Merge branch 'master' into midnight-fluffles 2017-05-29 15:37:40 +02:00
Fox McCloud
1c21d8eb98 Merge pull request #7403 from SamHPurp/Punching-above-its-weight 
Refactoring to use the WEIGHT_CLASS defines.
 2017-05-28 14:17:05 -04:00
IK3I
d5a0b1e0b7 Merges and fixes Conflicts 2017-05-27 20:42:23 -05:00
Sam
2d13e2f7bf Converts /modules/ to using WEIGHT_CLASS_x 2017-05-28 01:25:09 +01:00
FlattestGuitar
ca60a08f3c Merge branch 'master' into midnight-fluffles 2017-05-25 18:45:58 +02:00
tigercat2000
685bbdf320 Merge pull request #7322 from Aurorablade/KittyFluff 
Fethas Fluff Item
 2017-05-23 13:46:36 -07:00
Crazylemon64
c10300b8e2 Steel Sallet now copies attributes of the item it was made from 2017-05-19 13:52:11 -07:00
Aurorablade
c3bc14392d RETURNCEPTION 2017-05-19 00:29:01 -04:00
Aurorablade
13a4ea8772 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into KittyFluff 2017-05-19 00:24:24 -04:00
IK3I
f4a7063733 Corrects and Rewords Fox Issue 2017-05-17 15:04:07 -05:00
Regen
bb148f23fd Merge branch 'master' into master 2017-05-17 20:33:09 +02:00
Regen
4769557840 Removes the bottle entierly 2017-05-17 20:32:27 +02:00
IK3I
045cbff456 Verb -> Button 
Makes the lighting toggle an action button.
 2017-05-17 07:31:52 -05:00
Aurorablade
eba2ff229e iokay then. 2017-05-17 01:33:44 -04:00
Aurorablade
61933c99dc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into KittyFluff 2017-05-17 00:11:29 -04:00
Aurorablade
ef2fd25de6 Foxedits 2017-05-17 00:08:05 -04:00
IK3I
0cf735601c Adds Fluff Webbing for IK3I 2017-05-16 22:33:12 -05:00
FlattestGuitar
e09c294a2f Merge branch 'master' into midnight-fluffles 2017-05-17 00:27:29 +02:00
Aurorablade
1cb0056588 a rather then an 2017-05-16 03:54:25 -04:00
Aurorablade
6a234d01c1 Fluffitem 2017-05-16 03:53:43 -04:00
KasparoVy
a8d5eaf497 Travelling Merchant's Sallet 
Adds a modkit that can make any non-space helmet look like a steel sallet.
The steel sallet can be adjusted via a UI button and has four states:
- Visor and bevor
- Visor only
- Bevor only
- Neither visor nor bevor

And will obscure the head as makes sense for each state.
 2017-05-14 20:57:38 -04:00
FlattestGuitar
dd9e58b705 Merge Conflicts and a passive-aggressive response to tiger 2017-05-07 19:24:25 +02:00
FlattestGuitar
060e146349 Associative lists 2017-05-07 14:49:36 +02:00
FlattestGuitar
8461b5375e Fluffs 2017-05-05 14:45:49 +02:00
FlattestGuitar
8978f1e530 Fluffpocalypse 2017-04-15 22:05:15 +02:00
FlattestGuitar
c73eb10c1b Adds a fluff item for DesolateG 2017-04-12 00:41:20 +02:00
Regen
1dcc6b2a5c Removes moonshine from the bottle 2017-04-05 01:08:43 +02:00
Andrii Yukhymchak
8bd1c25f6a initial fluffcommit 2017-03-23 21:41:21 +02:00
Tigercat2000
7c2b4c5038 PhantasmicDream fluff item: Witch hat 2017-03-21 15:25:48 -07:00