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
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
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
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
Ghommie
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01:00
TrilbySpaceClone
fa868ce4ff
fashen crime
2019-09-11 14:22:50 -04:00
Sishen
68083aa0c6
a
2019-07-25 21:43:02 -04:00
Sishen
612021b9d5
h
2019-07-25 21:43:02 -04:00
Trilbyspaceclone
a9eca3c143
Update clothesmate.dm
2019-05-16 15:51:46 -04:00
deathride58
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
Jordan Brown
1ee84bb7d2
Merge pull request #38580 from Hyacinth-OR/pinkscarf
...
Adds a pink scarf
2018-06-19 09:49:28 -05:00
deathride58
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBot
bd3d76b8d3
[MIRROR] Modularises vending machines ( #6050 )
...
* Modularises vending machines
* Update vending_items.dm
2018-03-22 06:10:17 -05:00