Anonymous
|
1bb8ff1c0c
|
Fixes loadout name, adds DAB outfit crate to cargo
For "recruitment" on-station.
|
2019-11-17 15:08:30 +03:00 |
|
kevinz000
|
2f4562a63b
|
Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
|
2019-11-14 15:55:04 -07:00 |
|
Anonymous
|
837052740a
|
Merge branch 'master' into assu
# Conflicts Resolved:
# icons/mob/head.dmi
# icons/obj/clothing/hats.dmi
|
2019-11-13 11:59:53 +03:00 |
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +01:00 |
|
nik707
|
12a69dcee5
|
Merge pull request #9574 from r4d6/patch-4
Add departemental Winter Coats to loadout
|
2019-11-05 13:52:48 -06:00 |
|
Ghommie
|
29daa0c908
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-04 22:59:24 +01:00 |
|
r4d6
|
0114b7fbe2
|
Comment out Sec coat
|
2019-11-03 16:51:07 -05:00 |
|
Anonymous
|
537ac0f6ca
|
Merge branch 'master' into assu
|
2019-11-01 19:05:53 +03:00 |
|
kevinz000
|
d9c38d0589
|
Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
|
2019-10-31 17:27:03 -07:00 |
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
Anonymous
|
ad00e6b36a
|
Merge branch 'master' into assu
|
2019-10-28 19:02:48 +03:00 |
|
Jay
|
9d830610bb
|
onion necklace
|
2019-10-27 11:52:38 -05:00 |
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
r4d6
|
cdb9d40bae
|
Add departemental Winter Coats to loadout
|
2019-10-22 14:38:09 -04:00 |
|
Anonymous
|
6a73abfe32
|
Adds ASSU suit+helmet and loadout stuff
Also adds newlines reeeeeeeeeeee
|
2019-10-20 23:52:06 +03:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02:00 |
|
Linzolle
|
1690596047
|
you asked for this kevin
|
2019-10-16 15:53:11 -05:00 |
|
kevinz000
|
11a93d41de
|
Merge pull request #9499 from r4d6/patch-1
Add a Blindfold to the loadout list
|
2019-10-15 22:57:02 -07:00 |
|
r4d6
|
a824998b89
|
Add a Blindfold to the loadout list
|
2019-10-14 11:48:14 -04:00 |
|
Jay
|
02b78a2817
|
changes donator item from glasses to a hat
|
2019-10-13 17:47:11 -05:00 |
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
Jay
|
e0b8d28386
|
donator item
|
2019-09-30 22:16:27 -05:00 |
|
Ghommie
|
db3c36fd9a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-09-01 01:59:00 +02:00 |
|
Ghommie
|
2a7b802957
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-08-29 21:01:23 +02:00 |
|
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
|
efe72ce973
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-08-09 06:47:27 +02: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 |
|
Ghommie
|
3bd0ba0275
|
Cleaning up Arousal code & co.
|
2019-07-23 06:39:53 +02: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 |
|