kevinz000
|
fb2971e3e6
|
Merge remote-tracking branch 'origin/master' into donator_grouping
|
2019-08-15 14:40:44 -07:00 |
|
deathride58
|
7879d1ce13
|
Merge pull request #9103 from Citadel-Station-13/atmosberet
Donator item
|
2019-08-14 15:44:24 -04:00 |
|
deathride58
|
2406254faa
|
Merge pull request #9100 from cebutris/got-milk
Breasts no longer lactate by default, Lactation is now a preference
|
2019-08-14 15:40:53 -04:00 |
|
kevinz000
|
123b478edd
|
Merge pull request #8927 from Ghommie/Ghommie-cit151
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-08-11 10:12:20 -07:00 |
|
deathride58
|
675c042958
|
Update __donator.dm
|
2019-08-11 08:38:13 -04:00 |
|
Jay
|
f17aea268c
|
Donator item
|
2019-08-11 01:07:20 -05:00 |
|
Cebutris
|
df136ab96c
|
lactation is now a preference
|
2019-08-10 23:28:16 -04:00 |
|
Ghommie
|
12c4fc139d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-08-09 04:00:23 +02:00 |
|
kevinz000
|
65473dc4ba
|
s
|
2019-08-07 13:18:45 -07:00 |
|
kevinz000
|
277971971f
|
s
|
2019-08-07 13:07:38 -07:00 |
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
Ghommie
|
b000aa4673
|
Fixes the dark sabre donator item.
|
2019-07-31 13:06:51 +02:00 |
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
Ghommie
|
969aaad3d1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151
|
2019-07-24 17:35:29 +02:00 |
|
kevinz000
|
ff08743f65
|
Merge pull request #8934 from Trilbyspaceclone/loadout
Removes a Rando plushies from loadout and adds in a few more items
|
2019-07-23 20:33:09 -07:00 |
|
Jay
|
ad036ac36d
|
adds for donator
|
2019-07-21 12:37:43 -05:00 |
|
TrilbySpaceClone
|
f315696937
|
fix n stuff
|
2019-07-20 22:19:03 -04:00 |
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
kevinz000
|
b134d23ea3
|
Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
|
2019-07-17 00:50:21 -07:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
Trilbyspaceclone
|
ea77d524e6
|
guess ill fuck up
|
2019-07-12 21:48:03 -04:00 |
|
TrilbySpaceClone
|
f68501b101
|
rng
|
2019-07-12 21:24:44 -04:00 |
|
deathride58
|
f2976caa59
|
Merge branch 'master' into patch-190
|
2019-07-08 17:58:41 -04:00 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
LetterJay
|
a17b4ff953
|
Merge branch 'master' into singerydonator
|
2019-07-05 14:31:31 -05:00 |
|
LetterJay
|
678a08e883
|
Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-07-04 14:23:37 -05:00 |
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
Fermi
|
27aad8f117
|
Quick in case.
|
2019-07-02 22:42:07 +01:00 |
|
Jay
|
e4ecb2894a
|
bedsheet for donator
|
2019-07-02 09:41:04 -05:00 |
|
Fermi
|
d83fe49556
|
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
|
2019-07-02 15:03:19 +01:00 |
|
Jay
|
ad9ba89d34
|
Yellow out for donator
|
2019-07-01 12:20:52 -05:00 |
|
Trilbyspaceclone
|
933851eb12
|
Update __donator.dm
|
2019-06-30 14:42:32 -04:00 |
|
TrilbySpaceClone
|
5087b97e18
|
Trending spriter
|
2019-06-29 20:18:32 -04:00 |
|
kevinz000
|
bf6811b981
|
Merge pull request #8742 from Trilbyspaceclone/MW2_suit
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
|
2019-06-29 15:18:01 -07:00 |
|
LetterJay
|
5f99d9ec04
|
Fixes wrong item path for donator loadout
|
2019-06-25 09:50:35 -05:00 |
|
TrilbySpaceClone
|
e84fd8942f
|
fix
|
2019-06-25 03:08:40 -04:00 |
|
TrilbySpaceClone
|
50aede119b
|
all works
|
2019-06-25 01:50:35 -04:00 |
|
TrilbySpaceClone
|
b485d8e750
|
Saves jay the trouble
Im a good cat
|
2019-06-24 02:21:04 -04:00 |
|
kevinz000
|
69d48c5e5e
|
Merge pull request #8736 from Trilbyspaceclone/Poojawa_How_Do_I_Update_My_Shit
Removes Nudity Permits and replaces them with invisible gear harnesses
|
2019-06-23 17:26:30 -07:00 |
|
Trilbyspaceclone
|
4278284e7b
|
Merge branch 'master' into Poojawa_How_Do_I_Update_My_Shit
|
2019-06-23 01:52:59 -04:00 |
|
TrilbySpaseClone
|
7f4d60ae25
|
Poojawa this would been easyer with webedits
|
2019-06-23 01:49:45 -04:00 |
|
Ghommie
|
69a302d4f4
|
Greytide Stationwide!
|
2019-06-22 00:03:28 +02:00 |
|
kevinz000
|
6c54c21d9c
|
Merge pull request #8653 from Citadel-Station-13/commjacket
Donator Comm Jacket - [Ready]
|
2019-06-16 19:54:24 -07:00 |
|
LetterJay
|
6b903893b2
|
Update __donator.dm
|
2019-06-16 20:54:02 -05:00 |
|
kevinz000
|
6149a44408
|
Merge pull request #8565 from SkullyRoberts/NudityPermit
Ported the nudity permit from RP and made it a loadout option. You're welcome, Everoth
|
2019-06-16 01:19:51 -07:00 |
|
kevinz000
|
12ecaf63ee
|
Merge pull request #8605 from Trilbyspaceclone/patch-174
Adds medical breifcases
|
2019-06-16 01:11:11 -07:00 |
|
kevinz000
|
6598688dd7
|
Merge pull request #8604 from Sishen1542/Scrubswasagoodshow
New loadout options: striped dress, bunny ears! & scrubs for MDs
|
2019-06-16 01:06:39 -07:00 |
|
Jay
|
fcd093f566
|
commjacket
|
2019-06-16 02:11:00 -05:00 |
|
TrilbySpaseClone
|
7f3e2dd28b
|
Kimono
Adds blue Kimono for SFox63
|
2019-06-11 18:00:08 -04:00 |
|