cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-19 14:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

483 Commits

Author SHA1 Message Date
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
BottomQuark
85af5d89f0 Fixes small mistake in item_defines.dm 2018-09-04 12:03:01 +02:00
BottomQuark
90fe0c0c44 Adds code to item_defines.dm, in-hand sprite to custom_items.dmi and overlay that should display on jumpsuits to ties_overlay.dmi 2018-09-03 13:45:57 +02:00
Aurorablade
be025f559c Spoodersuit 2018-08-22 20:36:22 -04:00
Fox McCloud
702f093c64 finishing touches 2018-07-18 22:14:44 -04:00
Fox McCloud
7440dad57e further conversion 2018-07-18 01:13:24 -04:00
Fox McCloud
aae5405d03 AGHHHHHHHHHHHHHHHHHHH WHATTT 2018-07-17 04:58:36 -04:00
FalseIncarnate
5823b354df merge conflicts 2018-07-01 02:42:31 -04:00
tigercat2000
c35ee54d27 Merge pull request #9057 from Aurorablade/PanzerSkullFluff 
PanzerSkull Fluff
 2018-06-13 13:48:18 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Aurorablade
48c5ae210c Panzer Fluf 2018-05-22 00:57:19 -04:00
Aurorablade
50ef895944 Fixes missing inhands 
including on other fluffs i did..
 2018-05-16 19:36:43 -04:00
Aurorablade
c8afde0bd0 how the hell.. 2018-05-15 19:21:24 -04:00
Aurorablade
1f0aa5e35e Fluff item 2018-05-15 01:17:25 -04:00
TravellingMerchant
e812cae73f Updates Merchants Fluff item. 2018-05-04 16:33:00 +01:00
FalseIncarnate
fdc986174b E.L.O. Fluff 2 
Second fluff item for E.L.O., wasn't included in previous PR due to
payment confirmation taking too long to bundle the two items together.

Adds E.L.O.'s second fluff item: a medal.

Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
 2018-04-30 22:09:35 -04:00
FalseIncarnate
94aa18ceda E.L.O. Fluff Item 
Adds E.L.O.'s fluff item: a personalized medical beret.

Ckey: `V-Force_Bomber`
Character Name: `E.L.O.`
 2018-04-29 12:32:26 -04:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
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