Commit Graph

44 Commits

Author SHA1 Message Date
LetterJay
0015e806ab donation item 2019-01-13 02:36:15 -06:00
kevinz000
4a50b86b47 Revert "[Ready] Makes synda paper mask correct eye sight and flash proof (#7858)"
This reverts commit 2b68547f8d.
2019-01-08 10:09:48 -08:00
Trilbyspaceclone
2b68547f8d [Ready] Makes synda paper mask correct eye sight and flash proof (#7858)
* Wow this is worthless

* Better tells
2019-01-08 02:41:12 -08:00
deathride58
c1af846c58 fixes the syndicate mask 2018-12-28 20:26:38 -05:00
Poojawa
c6f11fdf77 Fixes star trek memes 2018-12-17 08:41:59 -06:00
Poojawa
aa8d29fc53 Ensures suit.dm bandits are exempted 2018-10-07 05:36:56 -05:00
Poojawa
a05acf5c7e Finishes sprites, ensures proper equipping
Also blacklists customs that aren't in suit.dmi yet
2018-10-07 04:56:22 -05:00
deathride58
212187620b Merge pull request #7599 from Poojawa/override-override
Digitigrade Uniforms from Oracle
2018-09-29 21:30:12 -04:00
Poojawa
f2faf66586 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into modular_cit_cleaning 2018-09-28 22:09:19 -05:00
Poojawa
2daa197605 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into override-override 2018-09-27 05:09:23 -05:00
Poojawa
70d969c5cf Enables Digitigrade jumpsuit wearing 2018-09-27 05:08:39 -05:00
Poojawa
4ed3ac7b3d Purges Icon_override 2018-09-26 14:27:28 -05:00
Trilbyspaceclone
d6876446dd Removes armor form Fed Officer Cap (#7576)
_*Lets give everone armor at shift start!*_
2018-09-26 12:06:34 -07:00
Poojawa
4efdf4b0b3 Cleans up Modular_citadel
Yes I know it'll have merge conflicts later.
2018-09-21 03:52:13 -05:00
deathride58
77c2970b49 buffs the syndicate mask, makes it cost 2 tc (#7147) 2018-07-20 03:39:54 -07:00
deathride58
c8b9e94d1e Merge pull request #7354 from Trilbyspaceclone/patch-6
Removes armor form Non-head only Trek suits
2018-07-10 02:04:18 -04:00
Trilbyspaceclone
00f84818a1 Remove spaces at the ends of the paths
Ima dork and forgot to remove those
2018-07-07 09:13:23 -04:00
Trilbyspaceclone
1e31149039 Removes the //Cit Change 2018-07-07 00:48:04 -04:00
Trilbyspaceclone
0b0820937d Update trek_under.dm 2018-07-06 14:03:04 -04:00
Trilbyspaceclone
114c53c4f2 Removes armor form Non-head only suits
Basically get better armored suits then sec do!
2018-07-06 13:46:24 -04: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
deathride58
4d79c5ef09 Merge pull request #7110 from Michiyamenotehifunana/Random-Donator-Thing-1
Adds the Not-Nanotrasen Corporate Uniform and a Silver Bike Horn
2018-06-26 14:06:32 -04:00
Michiyamenotehifunana
e4e0e0d91d Adds random things for Jay to do things with 2018-06-15 13:50:15 +08:00
Michiyamenotehifunana
b62b9de0c1 Adds a tiny "pocket" to the M1 Helmet 2018-06-12 16:02:25 +08:00
Michiyamenotehifunana
a6966e2a97 Adds a (mostly) cosmetic flak jacket and helmet (#7045) 2018-06-10 12:31:54 -07:00
deathride58
6ac830a123 Combat rework adjustments (Making use of 512's new filter feature, small balance tweaks, and more) (#6092)
* makes use of 512's filters, adds combat mode toggle component signals, and more

* Update phantomthief.dm

* Update living.dm
2018-05-27 17:18:40 -07:00
deathride58
184441eb38 Merge pull request #6078 from Commandersand/LOADOUT
MORE LOADOUT STUFF
2018-05-02 17:29:44 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Michiyamenotehifunana
6a2b8bca3f Dumps in a bunch of donator exclusive polychromes 2018-04-20 17:34:59 +08:00
Michiyamenotehifunana
4c86571f9a Preliminary polish and implementation of exclusive polychromics 2018-04-10 22:56:16 +08:00
Michiyamenotehifunana
7015e631a2 Fixes everything, adds loadout stuff
"Fix" mandates the usage of workarounds
2018-03-29 23:51:55 +08:00
Michiyamenotehifunana
fb97695b6a Globalized, Broke everything 2018-03-27 22:40:27 +08:00
loginsandylogout
fe39a5a550 MOVED TO HERE 2018-03-22 23:28:33 -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
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
f3ab2c57d4 yey, working and in the loadout, though it fucks with the formatting 2018-03-07 02:44:50 -06:00
Poojawa
e07efc29fb stuffs 2018-03-06 20:10:14 -06: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
Zna12
c3c5f86971 Tacticool sensors (#5740)
* Tacticool Sensors

Tacticool Turtlenecks now have sensors, for those memes that want to wear them on station.

* Atom is screwing with me.

Fixed a rogue indent

* I had this part ignored. Woops.

* Code cleanup 101.

Apparently I didn't need the rest of this.

* Ree

Stupid admin.txt
2018-03-04 11:54:25 -06:00
Poojawa
c0850044a7 Flightsuit Armor adjustments (#5515)
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
2018-02-17 18:05:26 -06:00
Michiyamenotehifunana
389e6de8f5 FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269)
* FINALLY AFTER 2 MONTHS

WOOOOOOOOOOOOOOO

* Updates all polychromic code

This makes the default argument of all polychromic color input menus the last chosen color.
2018-02-06 19:08:08 -06:00
Michiyamenotehifunana
acec5bc6ad Merge branch 'master' into Medical-Turtleneck 2018-02-06 07:47:29 +08:00
Nick
0c07e1de56 [RDM]More loadout stuff (#5253)
* and BOOM SHAKALA

* Update uniform.dm

* hmm

* dedado

* boop

* Be da deem armor values!
2018-02-04 22:29:38 -06:00
Michiyamenotehifunana
c8468ed7a7 Adds CMO's Turtleneck! 2018-02-04 23:31:07 +08:00