2348 Commits

Author	SHA1	Message	Date
Timothy Teakettle	6392367df4	donator items	2020-08-18 17:28:09 +01:00
silicons	23443be90e	Update pumpenergy.dm	2020-08-13 15:27:07 -07:00
silicons	5694923d89	Merge pull request #13095 from lolman360/liver ... custom name/desc ring and necklace	2020-08-11 01:41:48 -07:00
lolman360	50448549fb	ee	2020-08-09 15:26:08 +10:00
Putnam	467f66b2a6	Removed crocin/hexacrocin.	2020-08-08 00:46:30 -07:00
silicons	65839060c9	Fixes	2020-08-06 23:39:57 -07:00
silicons	3640a33ff6	e	2020-08-06 23:22:53 -07:00
silicons	8edb374a20	sigh	2020-08-06 23:09:02 -07:00
silicons	1586625e6b	Merge pull request #12960 from timothyteakettle/loadout-you-say ... loadout changes part 1: adds subcategories to the loadout	2020-08-06 21:59:13 -07:00
Timothy Teakettle	b5a16d8945	MORE CLOTHES	2020-07-29 18:20:46 +01:00
Timothy Teakettle	31963b32a4	subcategories cool	2020-07-29 17:14:07 +01:00
silicons	78312c23bf	sigh	2020-07-28 21:53:07 -07:00
timothyteakettle	c15d0de20d	subcategories work	2020-07-29 03:57:16 +01:00
Lin	81a7542aa6	Merge pull request #12834 from silicons/clickcd_experimental ... Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)	2020-07-28 21:51:10 -05:00
Timothy Teakettle	721e018aec	loadout stuff	2020-07-28 22:52:00 +01:00
silicons	cac1627d26	Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion ... Ports RP flannel jackets and a winter coat	2020-07-28 10:45:54 -07:00
zerothebigboy	ef720c3481	a	2020-07-27 01:37:56 -04:00
zerothebigboy	df31d90c1b	a	2020-07-27 01:37:47 -04:00
zerothebigboy	9fbcd21af6	a	2020-07-27 00:36:38 -04:00
zerothebigboy	e30a60d0ba	a	2020-07-26 23:42:40 -04:00
silicons	1990f75957	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-25 23:46:27 -07:00
silicons	c4ec1dfdc1	Update neck.dm	2020-07-24 20:50:52 -07:00
silicons	c3be76b529	Update neck.dm	2020-07-24 19:32:51 -07:00
Lin	6fca9af0ed	Merge pull request #12848 from silicons/morecolors ... species customization now allows 16 million colors instead of 4 thousand	2020-07-23 13:28:50 -05:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	e1afca8617	Merge pull request #12845 from YakumoChen/MKUltra-Fix ... Mk ultra fix	2020-07-22 02:30:43 -07:00
silicons	744b6d6b48	Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent ... maid fetish content pr	2020-07-21 19:20:52 -07:00
zerothebigboy	fb35248e3b	a	2020-07-21 02:24:22 -04:00
silicons	87d53957bf	sigh	2020-07-20 20:09:13 -07:00
YakumoChen	8adfe633e3	Fixes MK	2020-07-21 01:27:22 +00:00
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
silicons	526d257410	fix	2020-07-20 11:48:08 -07:00
silicons	416b989e12	changes	2020-07-20 11:35:10 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	984796b8c6	sigh	2020-07-20 10:46:52 -07:00
silicons	58e26c540c	merge from master	2020-07-20 10:18:44 -07:00
silicons	55f8e37544	sigh	2020-07-18 20:26:11 -07:00
silicons	910869d6bf	more	2020-07-18 19:44:12 -07:00
Lin	ba3dc6a73b	Merge pull request #12679 from silicons/unarmed_parry ... Ok ok hear me out: Implements unarmed parry.	2020-07-18 17:02:02 -05:00
silicons	044525519a	Merge pull request #12750 from timothyteakettle/loadout-plushies ... replaces plushies in the loadout menu with a choice box	2020-07-17 17:10:14 -07:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
DeltaFire	ac2dd85743	runtime fixies	2020-07-14 18:25:13 +02:00
Timothy Teakettle	c3d490a803	very cool	2020-07-12 20:15:57 +01:00
silicons	6cbab55ef8	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-07 21:07:58 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00
Ghommie	e12c3382de	undefined variable.	2020-07-05 03:48:41 +02:00
Ghommie	562b57095d	mowing down the experimental cloner copypasta.	2020-07-05 03:04:53 +02:00
Cirno	020da9fa07	i hope this works	2020-07-04 15:47:38 -03:00
silicons	434a53340b	groan	2020-06-30 20:21:59 -07: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