Commit Graph

1000 Commits

Author SHA1 Message Date
Little-119 9ef559730c Ckey transfer 2021-11-18 17:16:02 -05:00
Casey 0502970c3f Merge pull request #11752 from Heroman3003/jobstuff2
Renames Engineer, new alt-titles for Stellar Delight
2021-11-06 03:44:47 -04:00
Hatterhat dc1559a150 gaiter 2 2021-11-02 19:06:11 -05:00
Heroman dbe9387f5f Renames Engineer, new alt-titles for Stellar Delight 2021-11-02 19:56:49 +10:00
klaasjared 56f4ab1b4c Base Commit 2021-10-27 16:18:30 -04:00
PastelPrinceDan 86627bfa9c no conflicts this time please, 2021-10-27 18:27:30 +01:00
Casey 18fa28a431 Merge pull request #11698 from GhostActual/toolz
Tool Time (Fixed)
2021-10-27 11:59:04 -04:00
Casey 086d348e2f Merge pull request #11642 from PastelPrinceDan/mask
paper masks, emotional mask
2021-10-27 11:22:30 -04:00
klaasjared fd2032bec7 Adds in flashlights from #11488 2021-10-23 00:10:33 -04:00
Aronai Sieyes d85b806091 Merge pull request #11572 from VOREStation/upstream-merge-8272
[MIRROR] Expands the ring selection
2021-10-22 14:39:18 -04:00
PastelPrinceDan e34f8e6414 joy mask 2021-10-01 00:06:45 +01:00
PastelPrinceDan 1742cf21d4 masks woo
papered masks :)
2021-09-30 21:33:24 +01:00
Ghost Actual 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdca.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
PastelPrinceDan 6cd28d62ac woo yeah overalls 2021-09-14 02:41:15 +01:00
MistakeNot4892 af10c9d0c9 Expands the ring selection 2021-09-05 23:29:36 -04:00
Verkister 865d117901 Fixes unresetable loadout name/desc gear tweaks
The loadout expects a text input in order to apply changes and empty input sanitizes into no input.
2021-08-27 16:21:51 +03:00
Aronai Sieyes cdd149e2f3 Merge pull request #11502 from VOREStation/upstream-merge-8234
[MIRROR] Adds Qipaos
2021-08-26 16:42:07 -04:00
Aronai Sieyes ff21e088d8 Mix qipao in with ours 2021-08-26 16:27:46 -04:00
Ghost Actual 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
MistakeNot4892 57a1978aab Adds Qipaos 2021-08-25 23:28:10 -04:00
PastelPrinceDan bd99ec4dc3 changes role name aeaueueuae 2021-08-23 03:13:20 +01:00
PastelPrinceDan 0981f9d1d3 more fixes grr i hate / 2021-08-22 05:22:19 +01:00
PastelPrinceDan ccb6a7cb17 woo yeah fix 2021-08-22 05:18:46 +01:00
PastelPrinceDan ea8bc0f300 clo tth ee s 2021-08-22 03:51:25 +01:00
Aronai Sieyes d8537ad704 Merge pull request #11439 from PastelPrinceDan/rdlabcoat
Ports RD labcoat from CitRP
2021-08-19 12:20:09 -04:00
PastelPrinceDan 60324d8ce8 labbed coat 2021-08-17 15:38:15 +01:00
PastelPrinceDan 3741b3e7f2 fixes the hood woo yea
i forgot the fucking hoodtype var please kill me
2021-08-15 13:14:36 +01:00
Aronai Sieyes a18e40c7ce Adds Teshari legwraps 2021-08-13 22:38:43 -04:00
Hatterhat 5e2d9d8c67 huh 2021-08-08 23:31:47 -05:00
Hatterhat 7ad08b7b12 single point of failure 2021-08-08 23:07:56 -05:00
Hatterhat 974f6970a8 woo yea grey blue jackets 2021-08-08 23:02:22 -05:00
Aronai Sieyes 202c34cc93 Fixes #11254 2021-08-01 10:25:38 -04:00
Aronai Sieyes 669d23322c Change various things to subtypesof() 2021-07-20 12:54:59 -04:00
Aronai Sieyes 34982728cb Add 'as anything' to various for loops 2021-07-20 12:39:59 -04:00
Novacat 982d88145d Merge pull request #11142 from Heroman3003/Talonflufffix
Fixes Talon being referred to as if ITV is a company
2021-07-19 11:11:38 -04:00
Heroman cda873287c Fixes Talon being referred to as if ITV is a company 2021-07-19 14:10:32 +10:00
Aronai Sieyes 25184e4af5 Fixes #11118 2021-07-18 11:42:26 -04:00
Aronai Sieyes fb6d907440 Return cloaks to 1 pt cost 2021-07-15 12:20:21 -04:00
Aronai Sieyes 1ca944043a Fixes #11052 2021-07-12 21:47:10 -04:00
Aronai Sieyes 421228916e Port lots of new clothes!!! AAAA 2021-07-12 19:05:52 -04:00
Aronai Sieyes 938be0debd Merge pull request #10847 from MarinaGryphon/nailpolish
Adds nail polish.
2021-07-05 19:55:48 -04:00
MarinaGryphon c44aa05d2a Code review and tweaks 2021-07-04 12:05:51 -05:00
MarinaGryphon d0c2d997af Adds nail polish remover. 2021-07-03 04:37:07 -05:00
MarinaGryphon 0ef1f57399 Adds nail polish
loadout fixes
2021-07-03 02:42:50 -05:00
Aronai Sieyes 4c12504e3b Replace list inputs with tgui_input_list 2021-06-26 10:39:56 -04:00
Novacat b03191237d Merge pull request #10743 from Heroman3003/M-U-G
Adds Mug with Text to loadout
2021-06-24 03:23:38 -04:00
Heroman d4d3ba9cf4 Adds Mug with Text to loadout 2021-06-24 17:05:32 +10:00
Novacat a20f7a7d2f Merge pull request #10732 from ResidentCody/Fluff-Item-Addition
Update loadout_fluffitems_vr.dm -- Adds an approved Fluff Item
2021-06-22 19:24:02 -04:00
Novacat a2a9bdef65 Merge pull request #10733 from Very-Soft/shine
Add approved fluff item
2021-06-22 19:23:49 -04:00
VerySoft b96d8934d0 remove da hyphen 2021-06-22 18:19:56 -04:00