Poojawa
1975c74efb
Fixes Cit_toggles by sanitizing it with less autism
...
how the fuck did it never go from toggles -> cit_toggles I haven't a
clue
2018-08-31 03:11:41 -05:00
LetterJay
070448f68f
fix
2018-08-06 11:35:58 -05:00
LetterJay
626c5a018e
Update __donator.dm
2018-08-05 20:14:52 -05:00
deathride58
4208d6ea5f
Adds boombox donor item for Raiq/chefferz ( #7368 )
2018-08-03 19:29:19 -07:00
LetterJay
e475970385
donate
2018-07-30 09:23:12 -05:00
LetterJay
82027db961
thing
2018-07-22 00:07:22 -05:00
LetterJay
5ad7fc35fd
Update __donator.dm
2018-07-06 00:54:01 -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
f8828db041
donator cape
2018-07-05 23:43:47 -05:00
deathride58
5189199b50
Merge branch 'master' into kitsundevilwings
2018-06-12 07:57:15 +00:00
Michiyamenotehifunana
a6966e2a97
Adds a (mostly) cosmetic flak jacket and helmet ( #7045 )
2018-06-10 12:31:54 -07:00
LetterJay
108ff89719
Dark Carapace - Donator Item ( #7055 )
...
* donator
* POWERGAME
2018-06-10 12:28:58 -07:00
deathride58
303d939116
Adds devilwings donor item for kitsun
2018-06-07 00:27:23 -04:00
LetterJay
26a24e49b7
Update __donator.dm
2018-06-03 09:02:44 -05:00
LetterJay
85ba48a053
donator item
2018-06-03 09:01:17 -05:00
LetterJay
e415aac87a
missed one
2018-05-21 08:38:09 -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
38628753d1
Update __donator.dm
2018-05-13 07:26:44 -05:00
LetterJay
1a1341989d
labcat thingy
2018-05-13 07:06:27 -05:00
LetterJay
1fbc06234f
Update __donator.dm
2018-05-05 07:24:37 -05:00
LetterJay
bbebcc85e7
Update __donator.dm
2018-05-05 07:23:33 -05:00
deathride58
184441eb38
Merge pull request #6078 from Commandersand/LOADOUT
...
MORE LOADOUT STUFF
2018-05-02 17:29:44 +00:00
LetterJay
b3f42dce0b
Update __donator.dm
2018-04-15 21:56:02 -05:00
LetterJay
33d6ee9f96
Update __donator.dm
2018-04-10 11:54:50 -05:00
kevinz000
820f4e7998
Update preferences.dm
2018-04-08 19:40:57 -07:00
kevinz000
83f1332229
>wiped my flavortext accidently
2018-04-08 19:39:06 -07:00
loginsandylogout
740c76beb9
damn
2018-04-04 13:23:15 -05:00
loginsandylogout
34fe469aa2
hold on
2018-04-04 13:22:27 -05:00
loginsandylogout
c2615881c7
ah
2018-04-04 13:21:42 -05:00
loginsandylogout
e7612b44fe
should fix it all
2018-04-04 13:19:59 -05:00
loginsandylogout
e14ff635ec
okay
2018-04-04 13:18:54 -05:00
loginsandylogout
7459b8b03c
hhhj
2018-04-04 13:16:49 -05:00
loginsandylogout
c27cb38a53
hhh
2018-04-04 13:14:30 -05:00
loginsandylogout
53454d8ab9
d
2018-04-04 13:13:30 -05:00
loginsandylogout
3b4b557687
a
2018-04-04 13:12:52 -05:00
loginsandylogout
d2cf2e8018
HMMM
2018-04-04 13:12:27 -05:00
loginsandylogout
d845bf84a9
k
2018-04-04 12:56:34 -05:00
loginsandylogout
a4e3b19891
maybe
2018-04-04 12:55:52 -05:00
loginsandylogout
417fa9e264
yes
2018-04-04 12:52:40 -05:00
loginsandylogout
cee51cd79d
should fix conflicts
2018-04-04 12:50:02 -05:00
LetterJay
5dbb046757
Merge pull request #6131 from deathride58/gearIDwhitelists
...
Adds support for manipulating gear entries via config
2018-04-02 05:50:10 -05:00
LetterJay
b09d271e17
Merge pull request #6174 from Michiyamenotehifunana/polychrome-Cloth-Globalize
...
(Partially) Globalizes Polychromic Clothing Code
2018-04-02 05:43:18 -05:00
loginsandylogout
2d038f3f94
gay
2018-04-01 18:31:26 -05:00
LetterJay
d36fac0662
another donator item
2018-03-31 21:49:15 -05:00
loginsandylogout
a4d949816b
increased glove csost
2018-03-30 13:38:07 -05:00
Michiyamenotehifunana
7015e631a2
Fixes everything, adds loadout stuff
...
"Fix" mandates the usage of workarounds
2018-03-29 23:51:55 +08:00
deathride58
3323a5e284
adds the ability to define gear entry whitelists via config
2018-03-27 01:33:02 -04:00
Ziiro
b70381c89e
Adds IPC Antennas ( #6049 )
2018-03-24 12:33:19 -07:00
LetterJay
cdf0ba3def
Oops
2018-03-23 12:18:48 -05:00