Commit Graph

334 Commits

Author SHA1 Message Date
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
Timothy Teakettle
c3d490a803 very cool 2020-07-12 20:15:57 +01:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Anonymous
9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous
45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
YakumoChen
2473308b4d Adds polychrome uniforms to loadout / kinkmate (#12506)
* adds revealing poly outfits to kinkmate

* Using unused poly uniforms

* adds polychrome to kinkmate
2020-06-12 17:07:48 -07:00
NopemanMcHalt
e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447)
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
2020-06-08 09:14:19 -07:00
Yawet330
fabfd684ce Silicon Flavortexts. (SCRUTINISE HEAVILY) (#12395)
* Part 1 - Adding the component

* Part 2 - Making the WRITE_FILE before changing the pref menu.

* Part 3 - Mirroring existing code, instead of tacking it on because im both lazy, and want a distinction

* Part 4 - Changes the preference tab to accomodate this.

* we made a brief fucky wucky!

* make it look noice

* fuckywucky mk2

* Part 5 - make it apart of the helper list (woops)

* that'yll do it.

* maybe fix?

* nope, just hit the delete button on their flavortext entirely :agony:

* Update preferences_savefile.dm

* Update silicon.dm

* Update preferences.dm

* Update silicon.dm
2020-06-04 15:53:39 -07:00
Ghommie
1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom
07df0102f8 Demodularizing a few reagents, a client var, the rest hud button. (#12329) 2020-05-24 13:21:14 -07:00
Ghommie
a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Lin
4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat
Adds a paramedic wintercoat
2020-05-21 19:26:31 +00:00
SiliconMain
1f4340103e Update suit.dm 2020-05-18 07:06:21 -05:00
Ghom
20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Anonymous
d61c0dc155 KHAAAAAAAAAAN!!
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
2020-04-17 10:53:43 +03:00
Ghommie
c1e13a83fb Boom. 2020-03-25 03:35:29 +01:00
Ghommie
c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie
eeab3ed11f Everyday 2020-03-19 17:34:01 +01:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +01:00
Ghom
fb32b018ef Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
2020-02-02 18:07:00 +01:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
2020-02-02 03:16:01 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
2020-02-02 01:46:58 -07:00
Winter Flare
c3ca884273 Moved Nurse Stuff below Scrubs 2020-01-31 23:08:31 -05:00
Winter Flare
847946bfe3 Fix cause I'm dumb 2020-01-31 22:53:27 -05:00
Winter Flare
12c0e475d8 Add Nurse Stuff to Loadout, fixes. 2020-01-31 22:36:25 -05:00
Winter Flare
599185654f Rename, Add item to Loadout
Renamed scrubs based on color, added Mailman Hat to loadout.
2020-01-31 21:54:21 -05:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
YakumoChen
9ba8a0e8e0 empty line 2020-01-31 14:15:59 +00:00
YakumoChen
babeea0b28 empty line 2020-01-31 14:15:38 +00:00
YakumoChen
77f6074c67 adds rings to loadout 2020-01-31 08:56:20 -05:00
Seris02
52e86a1ad6 yeet 2020-01-31 13:13:06 +08:00
Seris02
924d8a676c fixes kevinz error 2020-01-31 10:07:01 +08:00
necromanceranne
43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
Lin
15f36fab60 Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet
Adds cosmic bedsheet to loadout for donator
2020-01-29 19:43:01 +00:00
kevinz000
3de59b75fa Merge pull request #10678 from Ghommie/Ghommie-cit516
Stops the donor patriotic cape from being considered a bed sheet.
2020-01-28 17:58:07 -07:00
Jay
7171b661d1 Adds cosmic bedsheet to loadout for donator 2020-01-27 22:15:00 -06:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00
Ghommie
52d5074051 Stops the patriotic cape from being considered a bed sheet. 2020-01-23 18:19:31 +01:00
Unknown
bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
Arturlang
0d8a0e4963 Hah..... 2020-01-22 18:12:04 +01:00
Arturlang
aeb3a2f971 Update backpack.dm 2020-01-22 18:07:43 +01:00
Arturlang
53d80b2ef8 Initial Commit 2020-01-22 17:55:09 +01:00