Commit Graph

419 Commits

Author SHA1 Message Date
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
silicons
d58697c78d Merge pull request #14505 from timothyteakettle/the-most-important-pr
the loadout now recognises collars as polychromic items
2021-03-24 19:23:58 -06:00
Timothy Teakettle
7d4284b086 Update neck.dm 2021-03-23 21:33:50 +00:00
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
3fed89b16d fixthedamnballs 2021-03-19 02:01:37 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons
f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -06:00
SandPoot
5d13d61ea7 upload files 2021-03-15 11:11:17 -03:00
Jay
e4ab673e4a Adds Shrine Maiden outfit for donator 2021-03-14 18:40:01 -05:00
Lin
195d05b051 Merge pull request #14343 from Hatterhat/thanks-jay
no more nt chokers society has progressed past the need for nt chokers
2021-03-02 15:09:39 -06:00
Hatterhat
28833b67b8 you guys are not gonna fucking believe this 2021-02-28 21:09:41 -06:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
Lin
5517678780 Merge pull request #14286 from Citadel-Station-13/metalmaskDonator
Donator Item - Metal Mask
2021-02-22 11:15:37 -06:00
Jay
73be04412b Donator Item - Metal Mask 2021-02-21 19:57:43 -06:00
Adelphon
f795d007a9 bugfix 2021-02-20 18:18:27 -05:00
Adelphon
4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Adelphon
28d1f93b1c Clothing PR
I added two clothing that I made.
2021-02-09 00:41:11 -05:00
Jay
aba8d2ce2b NT Choker donator item 2021-02-05 09:57:19 -06:00
zeroisthebiggay
90bd136dad Update modular_citadel/code/modules/client/loadout/head.dm
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com>
2021-01-29 07:38:37 -05:00
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zeroisthebiggay
4b6f0d3ffa Update mask.dm 2021-01-26 14:11:00 -05:00
zerothebigboy
7b2a6955cc please 2021-01-26 13:13:09 -05:00
Timothy Teakettle
b956df2226 name description implement 2021-01-18 21:59:00 +00:00
silicons
ae290cf5f0 newlines 2021-01-13 16:56:36 -07:00
Timothy Teakettle
c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
Timothy Teakettle
e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
timothyteakettle
0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
Jay
e1c8d669d5 Exo frame donator 2020-11-07 10:23:14 -06:00
silicons
871084f43e Merge pull request #13636 from SiliconMain/patch-11
gas masks for engi loadouts
2020-10-29 14:05:19 -07:00
silicons
0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons
5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid
polychromic maid outfit
2020-10-28 07:46:55 -07:00
SiliconMain
1f46248c2c Update mask.dm 2020-10-28 09:27:59 -05:00
Timothy Teakettle
0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Ghommie
f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
timothyteakettle
71134ed8c3 better loadout flags 2020-10-25 01:08:35 +00:00
timothyteakettle
049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
Timothy Teakettle
608e5147de Revert "Revert "add color type to all polychromics""
This reverts commit 587a2f8f19.
2020-10-20 20:05:11 +01:00
LetterJay
81d0eb5631 Update __donator.dm 2020-10-19 22:10:20 -05:00
Jay
44fa0d5387 donator vest and shirt 2020-10-19 12:30:35 -05:00
Timothy Teakettle
587a2f8f19 Revert "add color type to all polychromics"
This reverts commit 02912aa4ad.
2020-10-15 23:05:07 +01:00
Timothy Teakettle
02912aa4ad add color type to all polychromics 2020-10-15 20:57:45 +01:00
Timothy Teakettle
37030baa70 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-10-15 20:05:56 +01:00
Timothy Teakettle
f337061c51 more defines 2020-10-15 20:05:39 +01:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00