Commit Graph

50 Commits

Author SHA1 Message Date
LetterJay
87dee7ff83 mime overalls - donator 2019-01-05 11:01:21 -06:00
deathride58
a73d43a664 FIXES MASTER 2018-12-28 19:48:12 -05:00
LetterJay
1db9e44f5b Adds two donation items 2018-12-28 10:09:42 -06:00
Poojawa
aa8d29fc53 Ensures suit.dm bandits are exempted 2018-10-07 05:36:56 -05:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping
Also blacklists customs that aren't in suit.dmi yet
2018-10-07 04:56:22 -05:00
Poojawa
729790f9d3 Overhauls some code, double checks uniforms 2018-09-28 03:54:57 -05:00
Poojawa
e4cdb0c853 Merge branch 'master' into override-override 2018-09-28 01:49:35 -05:00
Invader4352
0f4d060cb6 this is the fix of that goof I made 2018-09-27 11:50:17 -04:00
Invader4352
42aae3932e updated version of the pull following the advise of comments, also checking if the description of an item in custom_items.dm is carrying over 2018-09-27 11:39:10 -04:00
Invader4352
61f6bf085f Everything is finally done regarding my personal items, i sprited and coded them all and lost my mind a couple times cuz i had to re do it 3 times, then one of my files locked up, yadda yadda, fixed that, re did everything. EVERYTHING IS FUNCTIONING NORMALLY. ive added my personal items of a set of tails, ears, and a robe to go with them 2018-09-27 03:00:24 -04:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
deathride58
16cd2fcd43 lets try to fix this donor item 2018-08-12 18:38:40 -04:00
LetterJay
070448f68f fix 2018-08-06 11:35:58 -05:00
LetterJay
a56220634a i have no idea 2018-08-03 19:47:21 -05:00
LetterJay
fc21ee9f36 REMOVE 2018-07-25 22:12:34 -05:00
LetterJay
42cb534ad0 sprite/desc change 2018-07-25 06:38:54 -05:00
LetterJay
dbe376d751 bad names/var 2018-07-23 07:52:13 -05:00
LetterJay
82027db961 thing 2018-07-22 00:07:22 -05:00
deathride58
c1ae3a7ba6 fixes democracy 2018-07-07 14:10:32 -04:00
LetterJay
981743a170 Update custom_items.dm 2018-07-06 00:54:21 -05:00
LetterJay
a64dba6270 Merge branch 'flagcape'
# Conflicts:
#	icons/obj/custom.dmi
#	modular_citadel/code/modules/client/loadout/__donator.dm
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:51:42 -05:00
LetterJay
b245b940a4 Update custom_items.dm 2018-07-06 00:46:48 -05:00
LetterJay
5cacbfbe2e Merge branch 'flagcape' of https://github.com/Citadel-Station-13/Citadel-Station-13 into flagcape
# Conflicts:
#	modular_citadel/code/modules/custom_loadout/custom_items.dm
2018-07-06 00:45:52 -05:00
LetterJay
637c64f55b fuk 2018-07-06 00:42:25 -05:00
LetterJay
034a7da744 Merge pull request #7029 from Citadel-Station-13/kitsundevilwings
Adds devilwings donor item for kitsun
2018-07-06 00:40:00 -05:00
deathride58
5924595c8d adds icon_override 2018-07-06 00:48:21 -04:00
LetterJay
8e0a1a64af oops 2018-07-05 23:44:44 -05:00
LetterJay
f8828db041 donator cape 2018-07-05 23:43:47 -05:00
deathride58
f986f9c9f2 makes it compile. should work. hopefully 2018-07-02 15:35:11 -04:00
deathride58
842b64646b Update custom_items.dm 2018-06-17 05:44:13 -04:00
deathride58
5189199b50 Merge branch 'master' into kitsundevilwings 2018-06-12 07:57:15 +00:00
LetterJay
108ff89719 Dark Carapace - Donator Item (#7055)
* donator

* POWERGAME
2018-06-10 12:28:58 -07:00
deathride58
8169c9256f bumps the sprite down by 1 pixel. grrmbl rmbl rmbl 2018-06-09 02:02:53 -04:00
deathride58
303d939116 Adds devilwings donor item for kitsun 2018-06-07 00:27:23 -04:00
LetterJay
85ba48a053 donator item 2018-06-03 09:01:17 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
LetterJay
1e207a7430 modular_citadel 2018-05-20 23:04:13 -05:00
LetterJay
4fcca6ea4c Update custom_items.dm 2018-05-13 07:26:57 -05:00
LetterJay
1e84547584 Update custom_items.dm 2018-05-13 07:26:15 -05:00
LetterJay
1a1341989d labcat thingy 2018-05-13 07:06:27 -05:00
Poojawa
0d5d992732 compile fixes + initial map port 2018-04-23 03:37:10 -05:00
LetterJay
d36fac0662 another donator item 2018-03-31 21:49:15 -05:00
LetterJay
b3b8c5c7e6 donator stuff, cleans up file 2018-03-21 23:00:47 -05:00
LetterJay
8797bdace1 donator cloak thing, going to bed 2018-03-21 00:29:11 -05:00
LetterJay
e163a889fb i hate this shit 2018-03-18 15:53:20 -05:00
LetterJay
18759e03b3 op 2018-03-18 15:47:48 -05:00
LetterJay
380ec76618 sabre and sheath 2018-03-18 12:18:08 -05:00
LetterJay
1e7c6daeaf Update custom_items.dm 2018-03-11 14:17:18 -05:00
LetterJay
1f3c9fca30 adds two donator items 2018-03-11 07:22:46 -05:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00