3152 Commits

Author	SHA1	Message	Date
Jay	2819d028f0	Fixes misaligned sprite for the strange metal mask donator item	2021-02-24 22:52: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
silicons	98d23bb87b	Merge pull request #14256 from Adelphon/ppantsg ... Polychromic Pants & Jacket	2021-02-18 17:41:51 -07:00
silicons	e009b9ef5f	Merge pull request #14186 from SmArtKar/trading_card_game ... [READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1	2021-02-17 01:30:13 -07:00
SmArtKar	0e1e3aaaed	and more	2021-02-16 18:57:43 +03:00
SmArtKar	799917bc70	and more	2021-02-16 16:24:37 +03:00
SmArtKar	3da4c73fbe	Slight changes to balance, new cards	2021-02-16 15:57:05 +03:00
Adelphon	4c6685333b	Polychromic Pants & Jacket	2021-02-16 05:24:45 -05:00
SmArtKar	cf76b9d740	Fixes card saving, fixes some icons, adds rulebook	2021-02-16 12:12:20 +03:00
SmArtKar	375a6891bf	Adds new nuclear cards	2021-02-15 19:44:47 +03:00
silicons	5990a3ad4b	Merge pull request #14227 from Adelphon/polycloth ... CLOAK, PARKA, COLORFUL SHOES	2021-02-13 19:06:46 -07:00
DeltaFire	1ea3aafa10	Merge pull request #14166 from Hatterhat/ebola-nerf ... energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove	2021-02-12 05:06:48 +01:00
Adelphon	919e23c122	More Clothes	2021-02-11 02:36:50 -05:00
silicons	7c27de3735	Merge pull request #14216 from timothyteakettle/blood-fixes ... corrects two persistent blood related issues	2021-02-10 02:07:49 -07:00
Timothy Teakettle	5ebdb6deec	yes	2021-02-09 09:37:17 +00:00
Adelphon	28d1f93b1c	Clothing PR ... I added two clothing that I made.	2021-02-09 00:41:11 -05:00
Lin	7778ddaf96	Merge pull request #14195 from Citadel-Station-13/choker ... Donator Item - NT Choker	2021-02-08 13:56:44 -06:00
Lin	fe263ae2ff	Merge pull request #13890 from silicons/parry ... ablative parry armwraps	2021-02-05 23:52:18 -06:00
Jay	aba8d2ce2b	NT Choker donator item	2021-02-05 09:57:19 -06:00
SmArtKar	c9e97986c8	Patches, fixes, NUCLEAR CARDS	2021-02-05 12:13:38 +03:00
SmArtKar	3386511150	shiet	2021-02-04 21:57:07 +03:00
SmArtKar	2cd339f776	Adds Card Ops bundle	2021-02-04 18:57:00 +03:00
SmArtKar	348f57968f	Adds unique ruin cards and Exodia cards)	2021-02-04 16:42:55 +03:00
zerothebigboy	50a47f56bb	i forgot a sprite	2021-02-03 11:51:50 -05:00
SmArtKar	7b2e1ef44f	TCG!	2021-02-02 14:40:29 +03:00
Hatterhat	7c50b45e0d	oops	2021-01-31 19:53:58 -06:00
Hatterhat	4525b1b64f	ooOOooOO today i wont test my code again	2021-01-29 20:19:58 -06:00
silicons	540b8c280b	Merge pull request #14156 from zeroisthebiggay/cooming ... hair ports part two | now featuring skrell hair	2021-01-29 07:29:46 -07:00
silicons	e417d72703	Merge pull request #14150 from zeroisthebiggay/ohgodohfuck ... a zero pr that didn't need a followup pr to fix bugs doesn't exist | adds the multicolor berets to loadout	2021-01-29 07:29:39 -07:00
silicons	1974f2b41d	Merge pull request #14148 from zeroisthebiggay/whytho ... gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards	2021-01-29 07:29:28 -07:00
zerothebigboy	0bc3c5292c	arooga	2021-01-28 12:31:23 -05:00
MrJWhit	5a75028889	neck	2021-01-27 23:17:36 -05:00
zerothebigboy	c6420ae433	fuck	2021-01-27 22:59:44 -05:00
silicons	a973a3b088	Merge pull request #14145 from zeroisthebiggay/aeughfuck ... ports some hairstyles from rp because god knows we need some good hairs that aren't Short Hair 3 and Wisp	2021-01-27 19:08:25 -07:00
zerothebigboy	e7d8021b81	a	2021-01-27 18:46:11 -05:00
zerothebigboy	ee74f2c06c	here comes fetish content	2021-01-27 15:38:34 -05:00
zerothebigboy	f3072433ff	thankyoubasedrp	2021-01-27 14:56:26 -05:00
zerothebigboy	ad2864f137	aeughfuck	2021-01-27 13:30:44 -05:00
silicons	a1e92e55aa	Merge pull request #14102 from Hatterhat/somatobuff-50513 ... [READY] somatoray buff - mutation locks + revolution ray	2021-01-25 23:17:29 -07:00
Hatterhat	cbc19c7e91	depcards not in lockers	2021-01-23 19:37:39 -06:00
silicons	718cb3f501	Merge pull request #14092 from BlueWildrose/Timidwomen ... Adds Timid wo/man costumes	2021-01-20 15:21:06 -07:00
silicons	c786eb48ce	Merge pull request #14095 from necromanceranne/sprite_fixies ... Fixes deleted hypereutatic blade sprites	2021-01-20 15:20:55 -07:00
Hatterhat	a8cb8b79c6	for one, dont forget the sprites, dumbass	2021-01-19 17:40:34 -06:00
Hatterhat	fccf24ac17	sheef	2021-01-19 16:54:49 -06:00
necromanceranne	741fd455ec	Fixes deleted hypereutatic blade sprites	2021-01-19 19:46:11 +11:00
Blue Wildrose	88c21942d0	Merge branch 'master' into Timidwomen	2021-01-18 14:42:52 -07:00
Blue Wildrose	fd69938884	Tired of these motherfucking merge conflicts on this motherfucking PR	2021-01-18 14:31:40 -07:00
Blue Wildrose	381f27c5b1	will this work?	2021-01-18 14:28:16 -07:00