Commit Graph

11 Commits

Author SHA1 Message Date
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Ignari-Coldstorm
eb7f5634d5 Changes Jukebox Availability (#7905)
Changes the massive price of the jukebox to something much more affordable, as well as broadens access needed to use it.
2019-01-08 02:30:24 -08:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
deathride58
4636817ab5 Update packs.dm 2018-04-04 17:18:36 -04:00
theTiji0
2d06c71404 added space kiwis as a new simple mob (#5334)
* added space kiwis as a new simple mob

* Fixed syntax typo

I hate everything
2018-02-06 19:07:31 -06:00
deathride58
0ecb7ad81b Merge branch 'master' into cargonia-is-glorious! 2018-02-06 02:54:58 +00:00
Improvedname
b7f86583cd CAR GONIA 2018-02-05 20:18:21 +01:00
Improvedname
1ea5242cf4 Does a thing 2018-02-05 15:09:41 +01:00
Improvedname
ac17f58d3d adds kink refill packs 2018-01-29 21:00:32 +01:00
Poojawa
d1a07c4d3e Appeases Bhijn. Booty call requested. 2018-01-26 09:28:36 -06:00