Commit Graph

53 Commits

Author SHA1 Message Date
Trilbyspaceclone
1a8a699445 Add files via upload 2019-04-29 17:44:32 -04:00
Trilbyspaceclone
079dc70dc2 Delete food.dmi 2019-04-29 17:44:05 -04:00
kevinz000
8b54d33286 Merge pull request #8215 from Trilbyspaceclone/Sush
[Ready] Sushi!
2019-04-22 21:40:28 -07:00
kevinz000
6be4b7b969 Merge pull request #8260 from Trilbyspaceclone/cakes
4 more cakes!
2019-04-22 21:32:15 -07:00
Trilbyspaceclone
5d4917bf48 Add files via upload 2019-04-19 13:37:56 -04:00
kevinz000
b291a927f7 Merge pull request #8209 from Trilbyspaceclone/anitrad
Addtion ways to deal with radiation
2019-04-06 19:14:46 -07:00
Trilbyspaceclone
a9f99c6072 not the correct one 2019-04-05 16:05:04 -04:00
Trilbyspaceclone
478c95751d properly 2019-04-05 16:04:28 -04:00
Trilbyspaceclone
f07cdc1046 Add files via upload 2019-04-05 15:35:45 -04:00
Trilbyspaceclone
45499a7b2d Delete food.dmi 2019-04-05 15:35:12 -04:00
Trilbyspaceclone
d31389e1bb Add files via upload 2019-04-04 13:43:51 -04:00
kevinz000
ebdd1ecce5 Merge pull request #8173 from Trilbyspaceclone/2.0Defibs
Defib upgrade tech
2019-04-02 05:35:04 -07:00
Trilbyspaceclone
c2b25607fe Add files via upload 2019-03-26 21:10:59 -04:00
Trilbyspaceclone
6254170dc1 Delete drinks.dmi 2019-03-26 21:10:33 -04:00
Trilbyspaceclone
d231c7d1c5 Delete drink.dmi 2019-03-26 21:10:18 -04:00
Trilbyspaceclone
558eba89ec Add files via upload 2019-03-26 13:09:29 -04:00
Trilbyspaceclone
a7b7d7492a Add files via upload 2019-03-18 18:52:38 -04:00
Zargul
a201c29697 Fixing Star Trek DS9 uniforms (#7968)
Fixing the the mix-up of the DS9 uniforms. Command is now red, gold is now ops/security.
2019-02-05 18:08:13 -08:00
Ghommie
6d51dff3eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit2 2019-01-19 00:28:24 +01:00
Ghommie
4cefeb9ce2 1 2019-01-18 06:54:48 +01:00
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
Poojawa
c6f11fdf77 Fixes star trek memes 2018-12-17 08:41:59 -06:00
Poojawa
f194190621 Fixes some missing magmag mag icons 2018-09-01 03:52:24 -05:00
deathride58
4208d6ea5f Adds boombox donor item for Raiq/chefferz (#7368) 2018-08-03 19:29:19 -07:00
LetterJay
77b3c46dbf moves some stuff around 2018-08-01 08:07:56 -05:00
Bear
88fb190bed display images modularizing 2018-07-10 18:05:16 -04:00
Bear
4f48bc2dd5 pAI screen displays 2018-07-10 07:37:16 -04:00
Letter N
15029f8034 Add files via upload 2018-07-06 17:18:55 +08:00
Letter N
7cc32db240 Delete weapons.dmi 2018-07-06 17:12:16 +08:00
Letter N
abc32ed0df adds "cap's female formal outfit" (#7307)
* Update under.dm

* modifies cit_clothes.dmi

* Updates uniforms.dmi

* Update security.dm

* now wont remove other clothing stuff (TM)

* Add files via upload

* Update under.dm
2018-07-04 05:37:01 -07:00
Michiyamenotehifunana
e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00
Michiyamenotehifunana
a6966e2a97 Adds a (mostly) cosmetic flak jacket and helmet (#7045) 2018-06-10 12:31:54 -07:00
LetterJay
09cd9189e3 fixes missing shock collar icon 2018-03-22 12:10:08 -05:00
Poojawa
b4a7def5ca Hypospray kits and reworks! (#5907)
* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm
2018-03-21 15:28:06 -05:00
deathride58
0a331a26ee Merge pull request #5994 from Poojawa/beepboop
Adds IPCs refractors preferences
2018-03-21 19:20:43 +00:00
Michiyamenotehifunana
61fde978e1 Tennis Balls! (and donator stuff) (#5962)
* Donator rainbow stuff and balls!

* Updates code and adds izzy's donator thing

* Adds right click memes!
2018-03-20 19:11:34 -05:00
Poojawa
af82e1109f slight tweaks, revert job controller changes, penor layering tweaked 2018-03-20 10:41:36 -05:00
Poojawa
796e22beac LOCAL SUNE PORTS... OH GOD WHAT HAPPENED
That feel when you're in the 'Oh, well while I'm here...' mindset.
2018-03-18 09:02:13 -05:00
Poojawa
86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
Michiyamenotehifunana
0c0c0a5485 toys and stuff (#5772) 2018-03-04 13:07:42 -06:00
Michiyamenotehifunana
091fedc72b Adds Pump-Action Particle Blasters! (#5696)
* Adds pump action disablers and more!

* Fixes things, implements in a better way
2018-03-02 20:08:35 -06:00
Michiyamenotehifunana
9c87deac06 New sprites and inhands for eguns and lasers! (#5741) 2018-03-02 18:32:32 -06:00
Michiyamenotehifunana
49e662971f Updates Medical Wrench 2018-02-28 18:30:07 +08:00
Michiyamenotehifunana
1ee479266e Revision 15 of Syndivolver 2018-02-27 22:30:42 +08:00
Michiyamenotehifunana
70be9f3027 Reverts particle blasters, modifies sprites 2018-02-26 22:41:47 +08:00
Michiyamenotehifunana
b858e54d03 The Great Trigonometric Sprite Replacement, Phase 1! 2018-02-25 20:10:39 +08:00
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