1990 Commits

Author	SHA1	Message	Date
Nadyr	99ed4a1cc8	Merge pull request #1530 from CHOMPStationBot/upstream-merge-9882 ... [MIRROR] [MIRROR] Adds some new wheelchair types	2021-03-10 00:06:53 -05:00
Sharkmare	234bfbb791	Update hard override file and downports Vorestation changes of kin ... This updates our override file to no longer override the functions that are now just default handling	2021-03-09 22:55:53 +01:00
Chompstation Bot	a459be5696	[MIRROR] Adds some new wheelchair types	2021-03-09 16:29:51 +00:00
Nadyr	61d14c5ace	Merge pull request #1522 from CHOMPStationBot/upstream-merge-9876 ... [MIRROR] [MIRROR] Fixed/generalized loadout implants.	2021-03-08 23:32:43 -05:00
Novacat	955be2e5fe	Merge pull request #9876 from VOREStation/upstream-merge-7953 ... [MIRROR] Fixed/generalized loadout implants.	2021-03-08 16:53:20 +00:00
Novacat	ebf0391948	Merge pull request #9865 from Heroman3003/sizespace-suit ... Adds HYPER suit	2021-03-08 16:06:23 +00:00
Nadyr	f38596b023	Merge pull request #1499 from Sharkmare/kin-rework ... Shadekin Content Update + Whitelists for traits	2021-03-06 23:32:39 -05:00
Sharkmare	546b39a395	Putting whitie and black togehter apparently breaks ... So its a code block of its own	2021-03-06 17:54:16 +01:00
Sharkmare	06d969a967	Species whitelist for traits ... Tunes up the trait system to have a whitelist AND a blacklist so you can choose whichever makes you have to write the lowest amount of code	2021-03-06 17:23:41 +01:00
Nadyr	b1a47140e1	Merge pull request #1501 from CHOMPStationBot/upstream-merge-9852 ... [MIRROR] Crosses out mime/clown options if you aren't whitelisted for them	2021-03-06 05:29:15 -05:00
Novacat	610adc740b	Merge pull request #9852 from Heroman3003/whitelisted-job-limit ... Crosses out mime/clown options if you aren't whitelisted for them	2021-03-05 14:49:52 +00:00
Novacat	d9a0ad4732	Merge pull request #9848 from Sharkmare/patch-5 ... Fixing traits left display	2021-03-04 18:52:08 +00:00
Nadyr	ddc8ef59db	Merge pull request #1481 from CHOMPStationBot/upstream-merge-9710 ... [MIRROR] Go [Verb] Yourself!	2021-03-04 04:20:19 -05:00
Novacat	de16303003	Merge pull request #9710 from KillianKirilenko/kk-misc4 ... Go [Verb] Yourself!	2021-03-03 16:09:37 +00:00
Chompstation Bot	e83c299e8d	[MIRROR] Removes ping subsystem that was breaking chat	2021-02-28 23:02:17 +00:00
Darlantan	6975d3a5bd	Manual mirror	2021-02-28 05:35:22 -05:00
cadyn	5e17d7737c	Merge pull request #1428 from CHOMPStationBot/upstream-merge-9804 ... [MIRROR] Improved Trait Exclusion Logic v2	2021-02-27 15:48:34 -08:00
cadyn	20722857c8	Merge pull request #1434 from CHOMPStationBot/upstream-merge-9772 ... [MIRROR] [MIRROR] Sideports a couple of init unit tests from Neb.	2021-02-27 15:48:24 -08:00
cadyn	52695407cc	Merge branch 'master' into upstream-merge-9804	2021-02-27 15:39:43 -08:00
cadyn	695fc3db7d	Merge pull request #1262 from CHOMPStationBot/upstream-merge-9659 ... [MIRROR] Improved Trait Exclusion Logic	2021-02-27 15:38:34 -08:00
cadyn	e8852a363f	Merge branch 'master' into upstream-merge-9772	2021-02-27 15:31:43 -08:00
cadyn	e9dbe2b585	Update 07_traits.dm	2021-02-27 15:00:16 -08:00
cadyn	6ccc54e3a1	Update 07_traits.dm	2021-02-27 14:58:55 -08:00
cadyn	8739e5fb57	Update trait_defines.dm	2021-02-27 14:55:02 -08:00
Chompstation Bot	ad57e1ad13	[MIRROR] Sideports a couple of init unit tests from Neb.	2021-02-27 18:45:36 +00:00
Chompstation Bot	dbc2902fc1	Steals and fixes a memory leak fix from the freeloaders	2021-02-27 15:06:52 +00:00
Chompstation Bot	f097111c56	Improved Trait Exclusion Logic v2	2021-02-27 00:21:13 +00:00
Razgriz	c95874c696	Merge branch 'master' into upstream-merge-9695	2021-02-18 04:36:11 -07:00
Razgriz	b04455dac1	Merge pull request #1315 from CHOMPStationBot/upstream-merge-9540 ... [MIRROR] [MIRROR] Excised Errant Bay Military Lore	2021-02-18 04:20:25 -07:00
Razgriz	6ded190412	Merge pull request #1283 from CHOMPStationBot/upstream-merge-9539 ... [MIRROR] [MIRROR] Adds proc to properly update human icon gender	2021-02-17 15:02:54 -07:00
Chompstation Bot	6ec5b84175	TGUI Character Directory (baked bundle)	2021-02-14 07:55:01 -05:00
Nadyr	97fb94b10f	Update preferences_vr.dm	2021-02-14 06:56:57 -05:00
Razgriz	eb8bf0f143	Update 03_body.dm	2021-02-13 15:59:07 -07:00
Chompstation Bot	bef209f13c	[MIRROR] Excised Errant Bay Military Lore	2021-02-13 05:51:00 +00:00
Chompstation Bot	870b6afa45	No ERP -> Unset	2021-02-12 22:33:03 +00:00
Novacat	bed22ac830	Merge pull request #9693 from VOREStation/upstream-merge-7871 ... [MIRROR] Medical Soft/Field Cap	2021-02-12 20:15:33 +00:00
Chompstation Bot	a5801d04b6	[MIRROR] Adds proc to properly update human icon gender	2021-02-10 19:14:53 +00:00
Razgriz	5c7d335e2b	Revert "Revert #1240"	2021-02-08 17:36:28 -07:00
Chompstation Bot	9ecd032190	Improved Trait Exclusion Logic	2021-02-08 19:21:07 +00:00
Razgriz	7313c4c3de	Revert Size traits #1240 ... #1240	2021-02-07 16:50:01 -07:00
Chompstation Bot	d1e1c62d1d	Adds body shape traits and proper preview scaling	2021-02-05 21:09:43 +00:00
Chompstation Bot	d3c7cc6040	New advanced Egg Release mechanics.	2021-02-01 19:35:41 +00:00
Cadyn	00bc513e6e	Implementing TGSQL security	2021-01-27 10:51:12 -08:00
Cadyn	76ed115e37	Porting TG's SQL	2021-01-25 23:37:49 -08:00
cadyn	cb74ad2b41	Merge branch 'master' into upstream-merge-9601	2021-01-25 16:04:40 -08:00
cadyn	e815dbe29f	Merge pull request #1164 from CHOMPStationBot/upstream-merge-9582 ... [MIRROR] Makes most neutral traits available to all species	2021-01-25 16:02:59 -08:00
Novacat	3954bedb9d	Merge pull request #9606 from VOREStation/upstream-merge-7834 ... [MIRROR] fixes some sprites, adds a thin blindfold	2021-01-25 03:09:35 +00:00
cadyn	b3a17b2678	Update 07_traits.dm	2021-01-24 16:16:55 -08:00
cadyn	5b53679fbe	Merge branch 'master' into upstream-merge-9582	2021-01-24 09:03:00 -08:00
Chompstation Bot	ed3a6fdcb1	Should fix the broken species	2021-01-24 08:13:31 +00:00