4403 Commits

Author	SHA1	Message	Date
Artur	f97f264fb7	Fixing more stuff ... Mint machine compile fixes and the syndicate contractor program.	2020-04-23 20:09:42 +03:00
Artur	321902c35a	Ports https://github.com/tgstation/tgstation/pull/50225	2020-04-23 13:28:09 +03:00
Artur	80b47ec1c0	Ports https://github.com/tgstation/tgstation/pull/50497	2020-04-23 09:55:28 +03:00
Ghom	c7780bde9e	Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5 ... Shuffles resist embed higher up on the resist chain	2020-04-20 22:34:03 +02:00
kevinz000	a984fc5e3d	Update living.dm	2020-04-20 11:45:22 -07:00
kevinz000	096a182a84	Update living.dm	2020-04-20 11:44:59 -07:00
kevinz000	ae27bf90e4	Merge pull request #11846 from Putnam3145/vore-optimization ... Optimizing vore + commenting out simplemob vore (sorry)	2020-04-19 16:45:44 -07:00
Lin	8d8a0b0f45	Merge pull request #11899 from Ghommie/Ghommie-cit686 ... Fixing some more mistakes I did to clothing.	2020-04-19 00:24:29 +00:00
Ghom	50ee5b9de5	Merge pull request #11885 from kappa-sama/patch-21 ... ports "Makes visible(based on sight) messages always appear to mobs in range of 1 despite in darkness"	2020-04-18 05:44:53 +02:00
Putnam	33039f9962	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization	2020-04-17 18:56:26 -07:00
Putnam	c8ce60c856	Added back some vore default modes.	2020-04-17 18:46:09 -07:00
Lin	7cc7d6884a	Merge pull request #11820 from kevinz000/shield_bashing ... Shield bashing	2020-04-17 20:45:40 +00:00
Ghommie	7581d1d5cf	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit686	2020-04-17 18:37:25 +02:00
Putnam3145	6e8f58d945	Merge pull request #11893 from Citadel-Station-13/Ghommie-patch-3 ... Once upon a time, a based guardian anchored its name to others' minds.	2020-04-17 09:36:53 -07:00
Ghommie	c5c75c0870	Fixing some more mistakes I did to clothing.	2020-04-17 18:32:11 +02:00
kevinz000	09f459a369	Merge pull request #11730 from Ghommie/Ghommie-cit667 ... Minor snowflakes clothing variations refactor. Removal of copypasted states.	2020-04-17 05:49:09 -07:00
kevinz000	3c4c67b6c5	Merge pull request #11869 from necromanceranne/pawnch_updaties ... Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes	2020-04-17 05:43:49 -07:00
kevinz000	4f02c6f3c5	Merge pull request #11875 from Ghommie/Ghommie-cit683 ... Fixing some dog tier issue.	2020-04-17 05:40:50 -07:00
kevinz000	61f833b953	Merge pull request #11852 from Ghommie/Ghommie-cit681 ... Custom skin tone preferences.	2020-04-17 05:16:04 -07:00
Ghom	0fb1286042	Update guardian.dm	2020-04-17 08:47:05 +02:00
kappa-sama	21f7a6032d	this	2020-04-17 00:50:42 -04:00
Ghom	bceca18626	Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1 ... you can no longer knock out xenomorphs by punching them in the face i guess	2020-04-16 19:04:16 +02:00
Ghom	747672eb50	Update update_icons.dm	2020-04-16 16:44:07 +02:00
Ghommie	42b67d9240	PR is ready.	2020-04-16 16:33:04 +02:00
Ghommie	fe43581d31	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667	2020-04-16 15:09:52 +02:00
Ghommie	7193efa613	Fixing some doggie issues.	2020-04-16 05:29:17 +02:00
kevinz000	e533103ed2	Merge branch 'master' into shield_bashing	2020-04-15 19:34:08 -07:00
necromanceranne	61df831216	also makes martial artists spend stamina on disarm aaah	2020-04-15 20:07:01 +10:00
necromanceranne	d0d766efb5	Some balance alterations to make pugilism actually worth a damn, lets you craft armwraps (magic ones too if you want to go to the effort), and also buffs some stamina damage on various martial arts	2020-04-15 19:00:01 +10:00
kevinz000	20c3c648ce	Update living.dm	2020-04-14 21:50:39 -07:00
Linzolle	d43cb78b8b	one more	2020-04-14 18:02:51 -05:00
Linzolle	39e6541ccd	remove bad words	2020-04-14 17:54:07 -05:00
Linzolle	f828f4c4b7	Merge remote-tracking branch 'forrest/wewlad' into tos-compliance	2020-04-14 17:33:47 -05:00
Ghommie	571584901c	Custom skin tone preferences.	2020-04-14 19:10:28 +02:00
Ghom	49e36e47ff	Merge pull request #11809 from kevinz000/storage_rework ... Adds baystation-style volumetric space storage support	2020-04-14 13:17:11 +02:00
Artur	356f2913d7	Ghommies suggestions and renames a proc	2020-04-14 09:30:14 +03:00
Artur	f910a0fd32	Conflict fixes	2020-04-14 09:27:54 +03:00
Putnam	70b771a8f2	Also made bellies only generate when needed.	2020-04-13 17:04:09 -07:00
Putnam	1e8fffbf0b	Replaced all the extraneous flags with bitflags	2020-04-13 16:47:43 -07:00
Ghommie	db43f53ac4	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611	2020-04-13 16:15:40 +02:00
kevinz000	105d405d2d	Merge pull request #11837 from Ghommie/Ghommie-cit678 ... Item color removal port fixes.	2020-04-12 22:34:45 -07:00
kevinz000	d6544af144	Update status_procs.dm	2020-04-12 22:25:46 -07:00
Ghommie	0d0f14d3f8	Item color removal port fixes.	2020-04-13 03:34:58 +02:00
kevinz000	6b6683846b	Merge pull request #11819 from Ghommie/Ghommie-cit672 ... Minor action datum refactor and spellcasting fix.	2020-04-12 17:02:36 -07:00
kevinz000	8604297dcd	Merge pull request #11811 from Ghommie/Ghommie-cit671 ... Fixes and standarizes a few liver troubles. Re-enables liver failure.	2020-04-12 17:01:50 -07:00
Ghommie	05a954f000	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611	2020-04-13 02:01:01 +02:00
kevinz000	d60932ca5d	Merge pull request #11697 from Ghommie/Ghommie-cit655 ... Ports "Obliterates item_color: new washing machine functionality edition"	2020-04-12 16:16:37 -07:00
Ghom	b00e97b848	Merge pull request #10732 from kevinz000/eldritch_affairs ... Eldritch Affairs	2020-04-12 20:47:19 +02:00
kevinz000	0ea1e557db	ok	2020-04-11 19:31:19 -07:00
Ghom	1babc75a69	Merge pull request #11818 from spookydonut/patch-1 ... Update spacemandmm to 1.4	2020-04-11 23:59:31 +02:00