Commit Graph

7 Commits

Author SHA1 Message Date
Cebutris
079127dd59 Adds in prayer beads! 2018-02-12 11:17:38 -05:00
Michiyamenotehifunana
acec5bc6ad Merge branch 'master' into Medical-Turtleneck 2018-02-06 07:47:29 +08:00
cebutris
44908503bf Stunswords! (#5179)
* adds in stunswords

* inhands!

* fixes cell charge text.

* adds in the kit and also fuck admin.txt

* Fixes some formatting

* replaces the placeholder icon with

* i hate everything

* tries to fix the dme. hopefully.

* tries again
2018-02-04 22:10:21 -06:00
Michiyamenotehifunana
c8468ed7a7 Adds CMO's Turtleneck! 2018-02-04 23:31:07 +08: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
cebutris
b2a5caa5ba Lavaknights now get polychromatic ID badges [READY!] (#5015)
* adds IDs to cammy's catknights

* sets the ID as a subtype for easier asset changing

* Makes lavaknight captains more captain-y

* icons!

* It's okay I'm only mildly an idiot

* Knight Badges are called Knight Badges

* Polychromes them hecking badges

* Polychromes them hecking badges

* Makes them work!

* moves the id to their own file

* how did I fucking miss this am I just that much of an idiot

* removes unnecessary copypaste

* they're not id cards i swear
2018-01-26 10:50:08 -06:00
deathride58
de1c378621 restores the PDA sprites by cecily and toriate 2017-12-12 21:39:33 -05:00