23146 Commits

Author	SHA1	Message	Date
silicons	824d11b085	death to lists	2020-07-03 02:34:59 -07:00
silicons	d85edbf8fb	ok	2020-07-03 02:15:06 -07:00
timothyteakettle	05fb7a67fc	Merge branch 'tray-and-jar' of https://github.com/timothyteakettle/Citadel-Station-13 into tray-and-jar	2020-07-03 03:46:12 +01:00
timothyteakettle	1316f51a03	better resist and air	2020-07-03 03:46:08 +01:00
Ghommie	f5ffd7d2a9	Easing fine tuning of the system.	2020-07-03 03:00:33 +02:00
Ghommie	396989f143	Fixes items' used skills list keys missing associated base traits.	2020-07-03 01:52:03 +02:00
Ghommie	92c846fdbf	Improvements to the recent clothing menu toggle hardsuit helmet feature.	2020-07-03 01:08:28 +02:00
Ghom	50716ee393	Merge pull request #12668 from Arturlang/strip_menu_helmet ... Hardsuit strip menu helmet toggle	2020-07-03 00:41:03 +02:00
Ghom	7370b7c687	Merge pull request #12671 from Sonic121x/patch-2 ... Fix Pilltype button (for real this time).also fix technode icon missing.	2020-07-03 00:26:28 +02:00
Ghommie	6fc584518a	Fixing (un)equip penalties from obscured inv slots.	2020-07-03 00:07:30 +02:00
Ghom	e586d03e0a	text spans.	2020-07-02 19:47:05 +02:00
Ghom	c919075aca	Thanks Timothy.	2020-07-02 19:46:10 +02:00
Ghom	4354b0bf6f	Actually fixing a dum dum feature.	2020-07-02 19:26:52 +02:00
Sonic121x	4ca695020a	add adigitigrade version of captain's female formal outfit.	2020-07-02 23:21:31 +08:00
Sonic121x	6240ade87d	Add digitigrade version of cmoturtleneck	2020-07-02 23:20:01 +08:00
Sonic121x	4e2b05a22a	Fix the missing Technode icon	2020-07-02 22:33:35 +08:00
Sonic121x	ea7fed0c8e	givme that pilltype button ... Fix pill type button	2020-07-02 22:30:28 +08:00
Ghom	ef60068f1c	Merge pull request #12666 from timothyteakettle/more-blood-fixes ... More blood fixes	2020-07-02 14:52:39 +02:00
silicons	5f11612078	Update preferences_savefile.dm	2020-07-02 03:00:35 -07:00
silicons	bb67ab5ddd	Merge pull request #12664 from Ghommie/Ghommie-cit827 ... Porting a few asset cache related PRs.	2020-07-02 01:49:27 -07:00
silicons	9ae040b904	Merge pull request #12657 from bunny232/witchhunterhat ... Witch hunter hat tweak.	2020-07-02 01:48:19 -07:00
silicons	7b99e69583	Merge pull request #12661 from LetterN/cool-fucked-up-another-master-branch-fixes-assetthing ... Fix broken UI icons	2020-07-02 01:46:14 -07:00
silicons	3f1119fcdb	Merge pull request #12630 from Ghommie/Ghommie-cit822 ... You can't (un)equip garments on/from obscured inventory slots anymore.	2020-07-02 01:44:59 -07:00
silicons	cbad654371	Merge pull request #12632 from Ghommie/Ghommie-cit823 ... Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size	2020-07-02 01:44:09 -07:00
silicons	9abeb9c07e	Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1 ... Nerfing shaft miners' paycheck.	2020-07-02 01:43:53 -07:00
silicons	e2975a44a1	Merge branch 'master' into policy	2020-07-02 01:23:19 -07:00
Artur	582d672109	Hardsuit strip menu helmet toggle	2020-07-02 01:31:15 +03:00
Timothy Teakettle	15e137dd18	Merge branch 'master' into tray-and-jar	2020-07-01 22:06:17 +01:00
Timothy Teakettle	8a0ab009dd	give trays better capacity	2020-07-01 22:05:14 +01:00
Timothy Teakettle	84d60a455e	wow its still spelt wrong	2020-07-01 21:53:34 +01:00
Timothy Teakettle	1cb1b4d7e6	oh my god its not even defined right	2020-07-01 21:29:10 +01:00
Timothy Teakettle	311e149562	fix bloodpacks	2020-07-01 21:00:01 +01:00
Lin	fa1e92d588	Merge pull request #12656 from Ghommie/Ghommie-cit826 ... Fixing two handed items and etcetera.	2020-07-01 14:30:16 -05:00
Ghom	aaffe3ec12	Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck ... attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514	2020-07-01 19:46:16 +02:00
Ghommie	f7de8034a1	Put an end to the null stack traces from icon2html's register_asset.	2020-07-01 19:26:09 +02:00
Ghommie	94f7dae62e	Porting "Fix asset cache verification" and other tiny bits.	2020-07-01 16:24:12 +02:00
Ghom	8de00e80dd	Update bag_of_holding.dm	2020-07-01 15:04:51 +02:00
kappa-sama	ad4f909d79	ashwalkers	2020-07-01 08:19:27 -04:00
kappa-sama	3695595034	ammunition	2020-07-01 08:17:13 -04:00
kappa-sama	73d616b3a4	more accurate	2020-07-01 08:13:30 -04:00
kappa-sama	406af65d93	you need 5 of these	2020-07-01 08:12:35 -04:00
kappa-sama	9cc6f5aa91	durathread->string	2020-07-01 08:09:43 -04:00
kappa-sama	49af0d11c7	string	2020-07-01 08:09:39 -04:00
kappa-sama	1fffd0a608	45 seconds lol	2020-07-01 08:02:41 -04:00
kappa-sama	0b0d9ff1a6	this	2020-07-01 07:56:55 -04:00
kappa-sama	cfc14a04f1	Merge branch 'master' into patch-28	2020-07-01 07:48:46 -04:00
kappa-sama	1f38c3029c	yeah ok	2020-07-01 07:40:43 -04:00
Letter N	b35e3f2b93	fix: R&D Console, Vending, and chem master	2020-07-01 19:07:03 +08:00
YakumoChen	8e25b90d54	removes obselete part	2020-07-01 09:08:01 +00:00
YakumoChen	327a36f8bd	removes obselete autolathe designs	2020-07-01 09:06:29 +00:00