Commit Graph

58 Commits

Author SHA1 Message Date
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
kappa-sama
3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kappa-sama
93fc0b3716 xenos helmet 2020-01-10 22:34:26 -05:00
kevinz000
8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Unknown
233ca30cd6 Merge branch 'master' into xantholne-christmas01 2019-11-28 23:21:36 -07:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss"
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
2019-11-27 20:23:33 -06:00
TrilbySpaceClone
2136968585 Ring ring 2019-11-21 21:55:17 -05:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
Anonymous
203509b405 Poll said its DAB 2019-10-27 16:27:03 +03:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355)
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
2019-10-25 16:19:19 -05:00
Anonymous
32d2476112 Moves stuff from modular, updates sprites
Also, digitigrade variant is corrected, hopefully.
2019-10-21 15:24:06 +03:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
Poojawa
4be05e412e Fixes Fedoras having armor values (#7521) 2018-08-31 12:13:50 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
Ordonis
ab81220eda Adds a French beret! HONH HONH HONH! (#37457)
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
2018-05-09 16:03:28 -05:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Jordan Brown
f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
ExcessiveUseOfCobblestone
f63a75b137 Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! 2017-09-10 17:08:36 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -05:00
LetterJay
77025ae8a2 Merge branch 'master' into upstream-merge-29651 2017-08-14 19:37:09 -05:00
LetterJay
46c6a54a75 Update misc.dm 2017-08-14 18:38:55 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
42fc6497d4 Fixes hair sticking through hats. 2017-08-06 03:13:11 -05:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
CitadelStationBot
64b721ae4f Halloween Costumes (#2169) 2017-07-28 23:51:11 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00