23551 Commits

Author	SHA1	Message	Date
silicons	44d3a0aa27	fixes	2020-07-24 20:37:02 -07:00
silicons	46fc0b6ae5	epic	2020-07-24 20:22:44 -07:00
silicons	33d5ba788b	aight	2020-07-24 20:19:18 -07:00
silicons	64de8f16a9	fixes	2020-07-23 16:59:27 -07:00
silicons	b20e3bc2b6	monkey attacks	2020-07-23 16:30:27 -07:00
silicons	53b3c6099b	ok	2020-07-23 16:27:41 -07:00
silicons	9c9014acdb	crate fix	2020-07-23 16:19:07 -07:00
silicons	d30acd5b09	smooth	2020-07-23 13:49:17 -07:00
silicons	c3ca4be149	ok	2020-07-23 13:47:07 -07:00
silicons	29a8c2eee6	flushed	2020-07-23 12:47:21 -07:00
silicons	80233e52af	ok	2020-07-23 11:56:08 -07:00
silicons	db3f9b4549	woops	2020-07-23 11:48:46 -07:00
silicons	95cd7c6571	fix	2020-07-23 11:46:46 -07:00
silicons	aaa536b8fc	ok	2020-07-23 11:38:15 -07:00
silicons	cd67be32e0	Update wishgranter.dm	2020-07-23 11:12:09 -07:00
silicons	21143ade21	eyeroll	2020-07-23 11:01:33 -07:00
silicons	da4e208f94	ok	2020-07-23 10:40:12 -07:00
silicons	db24df58a0	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:36:46 -07:00
silicons	9f66163d4f	Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20 ... Ports several food sprites/foods from Baystation/Citadel RP	2020-07-23 10:35:30 -07:00
silicons	ec72015f4f	Merge pull request #12809 from BlackMajor/borgo ... Gripper brained. The medborg can do chemistry now, oh no.	2020-07-23 10:35:16 -07:00
silicons	dad3d38933	Merge pull request #12869 from timothyteakettle/zombies-rework ... the very much needed zombie buffs	2020-07-23 10:29:43 -07:00
silicons	aeb6688bc7	Merge pull request #12860 from Sneakyrat6/burnablePhoto ... Allows Photos to be Burned	2020-07-23 10:29:10 -07:00
silicons	11a4dfd20b	Merge pull request #12861 from Sneakyrat6/dresserFix ... Fixes dressers not giving you undies	2020-07-23 10:28:54 -07:00
silicons	ce87d3e8c5	Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly ... ports tg radiation suits and also makes syndiekrav gloves actually visually distinct	2020-07-23 10:28:44 -07:00
silicons	d520eaa0ad	Merge pull request #12854 from Zandario/tipes ... tipes	2020-07-23 10:26:55 -07:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	9222933d77	Merge pull request #12816 from timothyteakettle/wound-port ... ports part 1 of tg wounds	2020-07-23 10:25:25 -07:00
silicons	4373e2b452	done	2020-07-23 10:18:10 -07:00
silicons	89a1fa544e	fixes	2020-07-23 10:12:34 -07:00
Timothy Teakettle	f5ac0b5762	some fixes	2020-07-23 18:10:46 +01:00
silicons	2eb6f0467d	fix guns	2020-07-23 09:56:38 -07:00
silicons	38a9e89687	ok bet	2020-07-23 09:49:56 -07:00
silicons	0858af4b85	ok	2020-07-23 09:43:43 -07:00
silicons	e425ef7d68	fix	2020-07-23 09:33:32 -07:00
silicons	99eb77c052	fix	2020-07-23 09:32:28 -07:00
silicons	703afec454	ok	2020-07-23 08:57:15 -07:00
silicons	65898bb7f6	inf loop	2020-07-23 00:32:05 -07:00
silicons	21d57eeeac	sigh	2020-07-23 00:27:45 -07:00
silicons	3a38344a04	fix	2020-07-23 00:25:06 -07:00
silicons	910290edcf	buffers	2020-07-23 00:22:33 -07:00
silicons	76f885e1a6	ok	2020-07-23 00:16:43 -07:00
timothyteakettle	a5945d3dc2	slight zombie tweaking	2020-07-23 01:09:09 +01:00
silicons	efb4d19a40	Merge pull request #12855 from DeltaFire15/AAAAAAAA ... Unfucks the monophobia traits (Aswell as traits in general) with this one simple trick	2020-07-22 11:41:48 -07:00
timothyteakettle	0ccbe0b793	it works	2020-07-22 14:49:22 +01:00
silicons	60a25981bc	Merge pull request #12835 from kappa-sama/patch-36 ... might fix necropolis chests turning up completely empty	2020-07-22 02:31:21 -07:00
silicons	a22c6b21c4	Merge pull request #12847 from Putnam3145/faster-chat ... Chat queue optimization	2020-07-22 02:30:31 -07:00
zerothebigboy	7870d90de3	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly ... # Conflicts: # icons/mob/clothing/hands.dmi # icons/mob/clothing/head.dmi # icons/obj/clothing/gloves.dmi # icons/obj/clothing/hats.dmi	2020-07-22 01:03:55 -04:00
silicons	744b6d6b48	Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent ... maid fetish content pr	2020-07-21 19:20:52 -07:00
Sneakyrat6	402f13ce1b	Fixes dressers not giving you undies	2020-07-21 20:33:58 -05:00
Sneakyrat6	2968963f19	Allows Photos to be Burned	2020-07-21 20:20:51 -05:00