4973f0d7f2
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FlagBearerFluff
2018-09-29 23:30:04 -04:00
2eeccc0c48
TigerFixes
2018-09-29 13:10:01 +12:00
c04f3b7f74
NameFix
2018-09-28 22:54:06 +12:00
dd9cbb861d
WinterSec
2018-09-28 22:42:38 +12:00
238f2db483
Requested Changes and Conflicts
2018-09-27 18:27:13 -07:00
7e4774416a
Requested Changes
2018-09-27 18:00:45 -07:00
1a7461fab7
Actually fixes conflicts!
2018-09-27 17:39:28 +08:00
37ed27f84b
Merge branch 'master' into Fluff
2018-09-16 17:20:17 -07:00
dadac2c755
E.L.O.'s fluff item
2018-09-14 19:37:27 -07:00
85e35bcba9
Merge pull request #9484 from BottomQuarks/BottomQuark_Fluff_Item
...
Bottom quark fluff item
2018-09-14 18:14:16 -07:00
5afe9b079c
Sprite Code
2018-09-08 14:27:33 -07:00
85af5d89f0
Fixes small mistake in item_defines.dm
2018-09-04 12:03:01 +02:00
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
be025f559c
Spoodersuit
2018-08-22 20:36:22 -04:00
702f093c64
finishing touches
2018-07-18 22:14:44 -04:00
7440dad57e
further conversion
2018-07-18 01:13:24 -04:00
aae5405d03
AGHHHHHHHHHHHHHHHHHHH WHATTT
2018-07-17 04:58:36 -04:00
5823b354df
merge conflicts
2018-07-01 02:42:31 -04:00
c35ee54d27
Merge pull request #9057 from Aurorablade/PanzerSkullFluff
...
PanzerSkull Fluff
2018-06-13 13:48:18 -07:00
aa9d658847
Them
2018-05-25 18:34:28 -07:00
48c5ae210c
Panzer Fluf
2018-05-22 00:57:19 -04:00
50ef895944
Fixes missing inhands
...
including on other fluffs i did..
2018-05-16 19:36:43 -04:00
c8afde0bd0
how the hell..
2018-05-15 19:21:24 -04:00
1f0aa5e35e
Fluff item
2018-05-15 01:17:25 -04:00
e812cae73f
Updates Merchants Fluff item.
2018-05-04 16:33:00 +01:00
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
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
8c7b543415
The Great Conflictening 2.0: Removes /obj/item/device
2018-04-25 23:07:35 -04:00
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
8c5992f1e6
Fox Fluff Item
2018-04-12 17:23:09 -04:00
4b03a9abba
Second fix part 1
2018-03-24 16:41:14 -08:00
a3183ee485
Upadates Patch's Jacket icons and adds some more colors
2018-03-23 17:42:59 -08:00
3b1783fe66
Second merge fix part one
2018-03-20 21:16:20 -08:00
28806f8fd5
Merge remote-tracking branch 'upstream/master' into terifluff
2018-03-13 05:20:20 +00:00
ae88de8669
Trying to solve the merge conflicts.
2018-03-13 04:50:25 +00:00
96fc4aba1c
Merge pull request #8671 from Aurorablade/PodFluff
...
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
413118d1b4
Removes the dance machine
2018-03-07 15:30:40 -09:00
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
cc5d9bc31e
Adds in Desolate's dance machine button
2018-03-06 22:10:12 -09:00
add4852d3c
Remove purple rose properly
2018-03-06 04:46:17 -08:00
337d95c23a
Adds Norsteads Fluff
2018-02-25 21:20:43 +00:00
252eccd7e0
Forgot to add the Char Name and Ckey
2018-02-20 14:21:49 +00:00
f2bc71a3f8
Fluff Item Bikehorn
...
A new bikehorn for Toodles. Buyers beware.
2018-02-11 15:03:28 +00:00
11872315ee
tiger changes
2018-02-10 00:45:55 -05:00
3bdecb4e54
spacepodfluff
2018-02-09 22:34:17 -05:00
b43875d497
TRUE
2018-01-06 23:15:13 -05:00
4c20790208
blue apprently..
2018-01-06 21:17:39 -05:00
70963a8a42
he is floffy fluffy
2018-01-06 20:38:13 -05:00
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
53d63a29f8
i thought i commited this...
2017-10-08 18:37:34 -04:00
Aurorablade