24274 Commits

Author	SHA1	Message	Date
lolman360	36bcc3a869	Merge branch 'plumb' of https://github.com/lolman360/Citadel-Station-13 into plumb	2020-08-18 18:57:35 +10:00
lolman360	b466a5aae9	e	2020-08-18 18:57:23 +10:00
lolman360	4e23559065	Update sheet_types.dm	2020-08-18 18:15:24 +10:00
lolman360	9931cb006c	eee	2020-08-18 17:33:20 +10:00
lolman360	d8e286d7be	ee	2020-08-18 16:17:00 +10:00
lolman360	325f4eb72e	Updates 2	2020-08-18 15:43:44 +10:00
lolman360	3040032409	documentation updates	2020-08-18 15:42:19 +10:00
lolman360	f2a86f2c42	Update medical_designs.dm	2020-08-18 14:23:09 +10:00
lolman360	8356dbf20a	Update medical_designs.dm	2020-08-18 13:26:32 +10:00
lolman360	32c0335a17	Update medical_designs.dm	2020-08-18 10:35:56 +10:00
lolman360	2f14d8998b	Update autohydro.dm	2020-08-17 22:42:41 +10:00
lolman360	6f7badda41	Merge branch 'master' into plumb	2020-08-12 09:03:11 +10:00
silicons	775fa046eb	you can now use any typepath as an emoji :/obj/item/clothing/mask/joy: (#12808) ... * Update emoji_parse.dm * Update emoji_parse.dm	2020-08-11 14:17:35 +02:00
silicons	a8d61b60ef	Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch ... adds a cybernetic eyepatch to the syndicate uplink	2020-08-11 01:47:32 -07:00
silicons	cf209939ea	Merge pull request #13070 from kappa-sama/patch-40 ... lowers price of 2 borderline useless uplink items	2020-08-11 01:44:40 -07:00
silicons	b16f920479	Merge pull request #13086 from ArchieBeepBoop/dev ... Add Skulldog Snout	2020-08-11 01:44:29 -07:00
silicons	e7d7b991d9	Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock ... The warcrime gun belongs in the armory	2020-08-11 01:44:07 -07:00
silicons	2d01c4db5b	Merge pull request #13106 from zeroisthebiggay/cesuitgoclick ... ce hardsuit no longer requires a jumpsuit to actually be fully radproof	2020-08-11 01:43:54 -07:00
silicons	16a556b367	Merge pull request #13101 from Detective-Google/funny ... spelling	2020-08-11 01:43:35 -07:00
silicons	df05c5ee4d	Merge pull request #13089 from Putnam3145/fix-sprite-display ... Demodularization + making certain sprite overlays less hilariously jank	2020-08-11 01:43:21 -07:00
silicons	c1d8d1d439	Merge pull request #13090 from lolzalolka/lean ... Added Burek to Space	2020-08-11 01:42:58 -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
silicons	035422ed7f	Merge pull request #13098 from LetterN/ToS-component ... Mafia Component	2020-08-11 01:41:13 -07:00
silicons	82824f9fb9	Merge pull request #13100 from lolzalolka/lean2 ... Suture/Mesh Crafting (take2)	2020-08-11 01:40:50 -07:00
lolman360	49948e77a4	SELLYOULOSE	2020-08-11 18:08:40 +10:00
Letter N	ab7c560f6d	revert	2020-08-11 16:04:18 +08:00
lolman360	f10053fe96	suture	2020-08-11 18:03:59 +10:00
lolman360	c699729250	lint	2020-08-11 17:53:51 +10:00
lolman360	740b4f3ecf	WHOOPS	2020-08-11 17:50:30 +10:00
lolman360	6ec9a3c4bd	craftable plunger	2020-08-11 17:38:16 +10:00
lolman360	6e2bb79834	Update medipenrefill.dm	2020-08-11 17:32:44 +10:00
lolman360	f977ac7180	e e e ee ee	2020-08-11 17:08:21 +10:00
lolman360	c18f0defd8	medi8el	2020-08-11 16:44:08 +10:00
silicons	5814eba033	Merge pull request #13103 from Hatterhat/oops-all-parries ... funny timestop katana is less funny and more gameplay oriented	2020-08-10 23:30:30 -07:00
Letter N	7008dac8dd	what if the maps aren't causing runtims	2020-08-11 11:49:25 +08:00
DeltaFire	0f27a89e5d	yeah this belongs into the armory ... Hellgun single pack goodies > armory	2020-08-10 18:41:56 +02:00
zerothebigboy	9baedbd904	a	2020-08-10 10:08:25 -04:00
zerothebigboy	cf75f7d4b6	a	2020-08-10 10:08:15 -04:00
Letter N	afe53992b5	miniump of 5, max of 12	2020-08-10 17:47:33 +08:00
silicons	05290c85f3	Merge pull request #13094 from Hatterhat/tc-theft-patch ... PDA Uplinks Can Now Siphon Pens	2020-08-10 02:30:11 -07:00
silicons	ef2c024fbe	Merge pull request #13093 from kappa-sama/patch-41 ... Tracer's a human, not a changeling.	2020-08-10 02:29:58 -07:00
silicons	3795bcf2d0	Merge pull request #13097 from zeroisthebiggay/yessalthairpr ... Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because	2020-08-10 02:29:47 -07:00
Letter N	c70f1510e6	fairly sure mmo mafia is not a thing and i'm lazy	2020-08-10 16:00:38 +08:00
Letter N	ec57c24a71	endgame	2020-08-10 13:10:40 +08:00
Letter N	a4040ace26	hewwo have you tried to work?	2020-08-10 10:50:07 +08:00
Hatterhat	ff49790ac9	radius/force/blockchance nerf	2020-08-09 21:27:57 -05:00
lolman360	1b35e02554	eee	2020-08-10 11:21:24 +10:00
lolman360	c160d73265	ee	2020-08-10 10:40:30 +10:00
lolman360	900b0b068a	linter take 3 ... love u putnam	2020-08-10 10:38:53 +10:00
lolman360	d9c198825b	linter 2:	2020-08-10 10:29:17 +10:00