23376 Commits

Author	SHA1	Message	Date
silicons	76f885e1a6	ok	2020-07-23 00:16:43 -07:00
silicons	286e5384d1	fix	2020-07-21 12:07:24 -07:00
silicons	2f11fb6a8b	ok	2020-07-21 11:59:39 -07:00
silicons	9a5e53a21f	ok	2020-07-21 11:57:47 -07:00
silicons	184e3992f3	fixes	2020-07-21 11:56:23 -07:00
silicons	4d48abf3a6	fixes	2020-07-21 11:46:17 -07:00
silicons	692656b02d	Whew	2020-07-20 11:53:33 -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	d43a5cae26	let's refactor attack_hand.	2020-07-20 11:19:20 -07:00
silicons	924309aab8	changeS	2020-07-20 11:11:12 -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	6ab250dd03	sigh	2020-07-20 10:13:50 -07:00
silicons	ae83a6df02	fix	2020-07-19 19:51:17 -07:00
silicons	55f8e37544	sigh	2020-07-18 20:26:11 -07:00
silicons	910869d6bf	more	2020-07-18 19:44:12 -07:00
silicons	b1ccccb322	more	2020-07-18 18:51:16 -07:00
silicons	1a040dd2a6	changes	2020-07-18 18:44:17 -07:00
silicons	0c6368e3e7	e	2020-07-18 18:34:16 -07:00
silicons	0b98b0409b	sigh	2020-07-18 18:29:09 -07:00
silicons	7c5d4f863d	click cd breakout	2020-07-18 18:10:21 -07:00
silicons	3d65be4ee9	sigh	2020-07-18 18:03:17 -07:00
silicons	1ba6777b35	Whew	2020-07-18 17:49:06 -07:00
silicons	771a28e685	oh boy	2020-07-18 17:48:51 -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
Lin	e165524763	Merge pull request #12803 from Citadel-Station-13/silicons-patch-32 ... removes tango dancing	2020-07-18 11:17:42 -05:00
Putnam	d88ade40bf	actually fixes uplink	2020-07-18 01:51:59 -07:00
silicons	b98102a824	Merge pull request #12762 from zeroisthebiggay/a ... drops martial art minpops down to twenty pop	2020-07-17 17:11:02 -07:00
silicons	a8e2b84ad8	Merge pull request #12763 from zeroisthebiggay/b ... hopefully fixes records possibly	2020-07-17 17:10:40 -07:00
silicons	c924290cd1	Merge pull request #12733 from TheObserver-sys/Finally,moreblorble ... Slime Extractification	2020-07-17 17:10:32 -07: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	8caf063765	Merge pull request #12757 from Owai-Seek/better-snack-comments ... Updates some comments.	2020-07-17 17:09:50 -07:00
silicons	93d669d205	Merge pull request #12759 from YakumoChen/hierophant-hugbox ... set hierophant friendly fire check to on by default	2020-07-17 17:09:17 -07:00
silicons	655afda020	Merge pull request #12780 from BlackMajor/borgo ... Even more engiborg power creep	2020-07-17 17:08:23 -07:00
silicons	3d5c77f62b	Merge pull request #12779 from b1tt3r1n0/circlegame ... Circle Game, Updated	2020-07-17 17:08:06 -07:00
silicons	04df84d1e0	Merge pull request #12776 from timothyteakettle/snail-shells ... snail shell backpack	2020-07-17 17:07:46 -07:00
silicons	183a929e42	Merge pull request #12775 from timothyteakettle/wrestling-rotation-fix ... wrestling rotation fix	2020-07-17 17:07:06 -07:00
silicons	a2c3643e20	fix	2020-07-17 12:46:32 -07:00
Lin	76c6c767d9	Merge pull request #12784 from silicons/shields ... fixes active block toggle not existing	2020-07-17 14:43:40 -05:00
silicons	cc6079d413	Update human_movement.dm	2020-07-17 09:10:03 -07:00
BlackMajor	9b671b7dd1	I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list	2020-07-18 03:08:52 +12:00
BlackMajor	eb9b3da581	Blacklist logic fix	2020-07-17 16:13:18 +12:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
silicons	e03948dcba	Merge pull request #12229 from Arturlang/TGUI-3.0 ... [READY]TGUI 3.0	2020-07-16 17:28:42 -07:00
Timothy Teakettle	ebd648c03d	name edgecase too	2020-07-16 18:32:24 +01:00
Timothy Teakettle	a8a495c0ac	rewrites pickle handling	2020-07-16 18:22:58 +01:00
Artur	9e73788714	Gah	2020-07-16 17:40:05 +03:00
BlackMajor	fc909cd7c6	Added material sheets and tiles. This took more work than you'd think.	2020-07-17 01:17:54 +12:00