Commit Graph

11 Commits

Author SHA1 Message Date
Artur
255f2ce449 Testmerge Conflict fix? 2020-01-22 20:17:42 +01:00
kevinz000
83ab577a6a Update launchpad_control.dm 2019-12-08 07:30:05 -07:00
kevinz000
2d9c6e64c5 Update launchpad_control.dm 2019-12-06 19:55:54 -07:00
deathride58
b2ec8f89e0 missed files 2018-07-05 01:27:07 -04:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05: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
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
b6b999b15a Lowercased computer names 2017-07-06 20:09:27 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879)
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
2017-05-18 07:12:13 -05:00