Hatterhat
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|
Hatterhat
|
7fac15caeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform
|
2020-01-12 12:39:57 -06:00 |
|
Hatterhat
|
47fd3823e8
|
staff assistant jumpsuit gang
|
2020-01-11 15:58:24 -06:00 |
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
Unknown
|
753c572a5e
|
I'm about to go into a comma
|
2020-01-09 11:21:00 -07:00 |
|
Unknown
|
62396bffb1
|
Clothesmate vending
|
2020-01-08 22:47:28 -07:00 |
|
kappa-sama
|
f69c67cf5c
|
tabs
|
2020-01-08 17:03:48 -05:00 |
|
kappa-sama
|
ceea7cd021
|
moves these over too
|
2020-01-08 16:47:22 -05:00 |
|
kappa-sama
|
38015d0d02
|
moves this
|
2020-01-08 16:45:52 -05:00 |
|
kappa-sama
|
341e076d40
|
refill 2
|
2020-01-08 16:43:47 -05:00 |
|
kappa-sama
|
18b78e7671
|
refill
|
2020-01-08 16:43:33 -05:00 |
|
kappa-sama
|
ebf8d048fd
|
perhaps?
|
2020-01-08 16:42:16 -05:00 |
|
kappa-sama
|
c88f58bb67
|
hm
|
2020-01-08 16:41:44 -05:00 |
|
kevinz000
|
5f03f5e3d8
|
Merge pull request #10457 from r4d6/Voice-Copy
Add a playback device and make the Voice Analyzer actually care about languages.
|
2020-01-08 13:33:54 -08:00 |
|
r4d6
|
6d3345d166
|
Add the Playback Device
|
2020-01-05 23:32:44 -05:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Unknown
|
0b02439b08
|
Puts an end to the Christmas Menace
|
2020-01-02 03:53:04 -07:00 |
|
Ghom
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
kevinz000
|
3f4594d78e
|
Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
|
2019-12-30 00:07:32 -08:00 |
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
Lin
|
80daaacc86
|
Merge pull request #10268 from Ghommie/Ghommie-cit487
Effectively removes the old unused roboticist encryption key and headset.
|
2019-12-28 00:08:24 +00:00 |
|
Commandersand
|
1a886adc3d
|
FIXEdD
|
2019-12-27 13:01:14 -06:00 |
|
Commandersand
|
815e57697d
|
vending
|
2019-12-27 12:29:39 -06:00 |
|
Ghommie
|
4fbd9fdca0
|
Effectively removes the long unrequired roboticist encryption key.
|
2019-12-22 12:02:15 +01:00 |
|
TrilbySpaceClone
|
c7dbdd73df
|
Merge branch 'master' into donut
|
2019-12-22 02:36:57 -05:00 |
|
Ghom
|
a33065a728
|
Merge pull request #10190 from Trilbyspaceclone/honeysoda
The new buzz around the new soft drink
|
2019-12-21 18:34:35 +01:00 |
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
Trilbyspaceclone
|
fe1576583c
|
Update code/modules/vending/cola.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-16 15:01:16 -05:00 |
|
Unknown
|
ad88481f3e
|
OwO whats this notices your
|
2019-12-15 16:45:34 -07:00 |
|
Unknown
|
008c4ef822
|
according to all known laws of aviation
|
2019-12-15 16:18:42 -07:00 |
|
TrilbySpaceClone
|
32cbe8588e
|
fogot the beest one
|
2019-12-15 01:15:55 -05:00 |
|
TrilbySpaceClone
|
5febc54fb8
|
whats all the buzz around this new drink?
|
2019-12-15 01:13:15 -05:00 |
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
Ghommie
|
79328012b0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402
|
2019-12-13 03:41:22 +01:00 |
|
TrilbySpaceClone
|
c4450579ac
|
Why does breakfast have a timer?
https://github.com/tgstation/tgstation/pull/44419
https://github.com/tgstation/tgstation/pull/46220
https://github.com/tgstation/tgstation/pull/44914
https://github.com/tgstation/tgstation/pull/46933
https://github.com/tgstation/tgstation/pull/48153
https://github.com/tgstation/tgstation/pull/46898
|
2019-12-07 01:53:55 -05:00 |
|
Unknown
|
97e686cf23
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-06 17:21:08 -07:00 |
|
Putnam3145
|
8d09f5a082
|
Merge branch 'master' into tinytweaks
|
2019-12-01 23:24:56 -08:00 |
|
Unknown
|
33854e8fd8
|
Adds a huge amount of Christmas clothes
|
2019-11-27 20:07:39 -07:00 |
|
Ghommie
|
4a3a7c841a
|
Removes literally atrocious polka dotted accessories.
|
2019-11-28 03:54:38 +01:00 |
|
Unknown
|
4e20f576e6
|
Merge branch 'master' into xantholne-berets02
|
2019-11-25 20:16:15 -07:00 |
|
Unknown
|
495b4b6ddc
|
Fixes some issues
|
2019-11-25 20:13:07 -07:00 |
|
Winter Flare
|
fb4a47d310
|
Added more items to vendors.
-Added stuff to the following:
clothing vendor
chef utensil vendor
snack vendors
kinkmate
|
2019-11-23 15:58:04 -05:00 |
|
Winter Flare
|
03dae580a9
|
Minor QoL and Wardrobe Updates
|
2019-11-22 14:08:12 -05:00 |
|
Unknown
|
4974400ccb
|
Merge branch 'master' into xantholne-berets01
|
2019-11-21 11:01:42 -07:00 |
|
Unknown
|
71b3b8fdc6
|
Ports/Adds new Berets
Ports some berets adds even more to most jobs
|
2019-11-20 22:21:20 -07:00 |
|
Seris02
|
7d99508bd0
|
adds janitor winter coat
|
2019-11-17 15:45:12 +08:00 |
|
Seris02
|
b7f4580414
|
robotics winter coat
|
2019-11-17 11:50:56 +08:00 |
|
Seris02
|
b146fd14f3
|
actually adds the winter coats
|
2019-11-16 18:25:05 +08:00 |
|
kevinz000
|
178aedc5cc
|
Merge pull request #9754 from Ghommie/Ghommie-cit330
porting "global to static"
|
2019-11-14 16:38:27 -07:00 |
|