15699 Commits

Author	SHA1	Message	Date
Letter N	b376a6b6c4	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-07-30 14:43:52 +08:00
Letter N	894ea242b4	asset cache update. may fuck shit up	2020-07-30 14:28:01 +08:00
Letter N	782e3c2ffb	copypaste phase complete, major:vendies	2020-07-30 14:17:35 +08:00
Letter N	10fefca674	another batch. MAJOR: chem_master, pandemic	2020-07-30 14:06:20 +08:00
Letter N	0805265412	yet another batch. MAJOR: APC	2020-07-30 12:54:53 +08:00
silicons	c60e595d99	Merge pull request #12955 from Arturlang/bloodsucker_life ... Plugs bloodsucker LifeTick into BiologicalLife	2020-07-29 14:02:22 -07:00
Lin	41a711ff01	Merge pull request #12959 from Citadel-Station-13/AAAAAAA ... FIXES LINTER ON MASTER	2020-07-29 15:59:20 -05:00
Lin	a7fe7f1317	Merge pull request #12953 from Adelphon/pog ... Adds Camo To AutoDrobe (fix)	2020-07-29 15:48:45 -05:00
silicons	ad3092d883	Merge branch 'master' into AAAAAAA	2020-07-29 11:13:33 -07:00
Timothy Teakettle	9a9993c7be	yep	2020-07-29 19:00:06 +01:00
silicons	bc823b544f	sigh	2020-07-29 01:17:16 -07:00
silicons	9ff94e019b	Merge pull request #12924 from SiliconMain/analyzer ... Ports long range atmos analyzer from skyrat	2020-07-29 01:09:48 -07:00
Letter N	5d4bb48628	another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator	2020-07-29 15:10:01 +08:00
silicons	78312c23bf	sigh	2020-07-28 21:53:07 -07:00
Lin	bbffd41d55	Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 ... beam rifles are now practical in emitters	2020-07-28 22:05:39 -05:00
Lin	a5dd08a054	Merge pull request #12734 from silicons/shoelaces ... shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.	2020-07-28 21:51:43 -05: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
Lin	ae02a7348c	Merge pull request #12929 from Citadel-Station-13/silicons-patch-59 ... silicons (and all other nonhuman mobs) can now block (with the right items)	2020-07-28 21:48:14 -05:00
Lin	e8ab87c396	Merge pull request #12928 from Citadel-Station-13/silicons-patch-58 ... silicons (and any other nonhuman mob) can now parry	2020-07-28 21:48:03 -05:00
Lin	91dc8b96d0	Merge pull request #12932 from silicons/ok_2 ... perfect parries with an energy sword now reflect projectiles back at their shooter	2020-07-28 21:45:53 -05:00
Lin	18fa47e479	Merge pull request #12931 from Citadel-Station-13/silicons-patch-61 ... nerfs parrying bullets with a wooden stick following complaints	2020-07-28 21:45:36 -05:00
Artur	e0d9c7972d	Makes it actually work	2020-07-29 01:50:40 +03:00
silicons	d8378e64be	Merge pull request #12942 from DeltaFire15/outfit-fix ... Fixes the 'Naked' outfit	2020-07-28 13:26:23 -07:00
silicons	ab67ae3291	Merge pull request #12951 from timothyteakettle/haha-yes-blood ... bloodsucker blood loss fix	2020-07-28 13:26:07 -07:00
Artur	09f2594c37	Plugs bloodsucker LifeTick into BiologicalLife	2020-07-28 22:58:13 +03:00
Adelphon	1f508ef15d	Adds Camo To AutoDrobe (fix) ... Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.	2020-07-28 15:04:58 -04:00
silicons	8313485632	fix	2020-07-28 11:31:28 -07:00
silicons	6c83beea02	Merge pull request #12937 from Ghommie/Ghommie-cit834 ... Fixing new bugs and stuff.	2020-07-28 10:46:17 -07: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
silicons	a5063a92b9	Merge pull request #12941 from timothyteakettle/alien-embeds-work ... aliens can remove embeds now	2020-07-28 10:45:31 -07:00
Timothy Teakettle	c8960624d3	sorry artur	2020-07-28 18:37:01 +01:00
silicons	475d8ed6fb	Merge pull request #12950 from timothyteakettle/species-are-dumb ... tail wagging fix	2020-07-28 10:15:17 -07:00
Timothy Teakettle	72972e1659	some species code fixes	2020-07-28 17:56:50 +01:00
silicons	b0f03eac12	ok	2020-07-27 21:06:03 -07:00
silicons	ffcfd21613	fix	2020-07-27 14:24:10 -07:00
silicons	5bf4afcade	sigh	2020-07-27 14:09:37 -07:00
silicons	67b518bf42	experimental	2020-07-27 13:09:54 -07:00
DeltaFire	9f3e7755ae	two line fix ... tin	2020-07-27 21:30:13 +02:00
Timothy Teakettle	8d9c94c087	aliens can remove embeds now	2020-07-27 17:59:05 +01:00
Lin	87eac49bbf	Merge pull request #12862 from Citadel-Station-13/silicons-patch-44 ... you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really	2020-07-27 11:46:37 -05:00
Lin	2514f4111d	Merge pull request #12900 from Citadel-Station-13/silicons-patch-53 ... drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)	2020-07-27 11:43:31 -05:00
Lin	ea861148b9	Merge pull request #12822 from Citadel-Station-13/silicons-patch-37 ... experimental change (testmerge this!): going from a higher slowdown to a lower slowdown will immediately allow you to move at the lower slowdown	2020-07-27 11:33:04 -05:00
Ghom	4fad4ad969	Merge pull request #12888 from Citadel-Station-13/silicons-patch-50 ... sorry gamers, no more self healing with a medbeam	2020-07-27 15:27:07 +02:00
Ghommie	f1c242aadc	Fixing new bugs and stuff.	2020-07-27 14:16:01 +02:00
silicons	22efdbffcd	woops	2020-07-26 23:08:41 -07:00
silicons	e90671c846	Merge pull request #12927 from Ludox235/we-cant-have-nice-things ... ZOMBIES. ACT LIKE ONE.	2020-07-26 23:00:33 -07:00
silicons	32b8528b16	Merge pull request #12921 from TheObserver-sys/LOOKGORDONATAG! ... Adds tags to applicable clothing, stating the defenses and resistances said clothes have.	2020-07-26 22:59:55 -07:00
silicons	401e8cf967	Merge pull request #12901 from CameronWoof/trumpet-cargo ... Adds spaceman's trumpet seeds to the exotic seeds crate	2020-07-26 22:56:59 -07:00
silicons	20d9c74f9f	Merge pull request #12876 from timothyteakettle/species-are-dumb ... tidies up species files	2020-07-26 22:52:00 -07:00
silicons	67c002de7a	Merge pull request #12817 from kappa-sama/patch-34 ... boosts stimpak cost back up to 5 from 3	2020-07-26 22:51:24 -07:00