45154 Commits

Author	SHA1	Message	Date
Chompstation Bot	21f58709d7	Fix two suit cycler problems	2021-07-20 03:20:06 +00:00
Nadyr	4a6c523aa6	Merge pull request #2591 from CHOMPStationBot/upstream-merge-11141 ... [MIRROR] Add a mapped-in outpost on Virgo 2	2021-07-19 20:09:47 -04:00
Nadyr	e08ad09428	Merge pull request #2590 from CHOMPStationBot/upstream-merge-11144 ... [MIRROR] Teshari cloak/suit/various fixes	2021-07-19 20:09:26 -04:00
Nadyr	17bb459bb6	Merge pull request #2597 from CHOMPStationBot/upstream-merge-11154 ... [MIRROR] Supermatter vial	2021-07-19 19:57:14 -04:00
Nadyr	d189d28954	Merge pull request #2596 from CHOMPStationBot/upstream-merge-11153 ... [MIRROR] Fixes #11151	2021-07-19 19:56:57 -04:00
Nadyr	8c666fdccf	Merge pull request #2595 from CHOMPStationBot/upstream-merge-11149 ... [MIRROR] Bows do damage	2021-07-19 19:56:36 -04:00
Nadyr	38b67b77c1	Merge pull request #2593 from CHOMPStationBot/upstream-merge-11136 ... [MIRROR] Prevent synths from taking temp traits	2021-07-19 19:56:08 -04:00
Nadyr	296480af84	Merge pull request #2589 from CHOMPStationBot/upstream-merge-11146 ... [MIRROR] Fixes #11138	2021-07-19 19:55:12 -04:00
Nadyr	cfc331d1f4	powder that makes you say yes	2021-07-19 19:54:58 -04:00
Nadyr	824595cc44	Merge pull request #2587 from CHOMPStationBot/upstream-merge-11142 ... [MIRROR] Fixes Talon being referred to as if ITV is a company	2021-07-19 19:53:41 -04:00
Nadyr	ca05adcb74	powder that makes you say yes	2021-07-19 19:53:21 -04:00
Nadyr	301ff96c5c	powder that makes you say yes	2021-07-19 19:51:08 -04:00
Nadyr	b27d27b8ae	powder that makes you say yes	2021-07-19 19:50:30 -04:00
Nadyr	ac60a6222e	powder that makes you say yes	2021-07-19 19:49:52 -04:00
Nadyr	1dcbca511f	powder that makes you say yes	2021-07-19 19:44:47 -04:00
Nadyr	269b675e8d	powder that makes you say yes	2021-07-19 19:42:51 -04:00
Nadyr	2705a86682	powder that makes you say yes	2021-07-19 19:42:26 -04:00
Nadyr	e1e4c98723	powder that makes you say yes	2021-07-19 19:41:48 -04:00
Aronai Sieyes	977f422509	Merge pull request #11154 from VOREStation/Arokha/supervial ... Supermatter vial	2021-07-19 22:23:52 +00:00
Aronai Sieyes	bd74045604	Merge pull request #11153 from VOREStation/Fixes/11151attempt2 ... Fixes #11151	2021-07-19 22:22:45 +00:00
Aronai Sieyes	0f547b6314	Merge pull request #11149 from VOREStation/Arokha/bows2 ... Bows do damage	2021-07-19 21:40:58 +00:00
Aronai Sieyes	ec8cc6e795	Merge pull request #11136 from VOREStation/Arokha/synthtemp ... Prevent synths from taking temp traits	2021-07-19 21:17:22 +00:00
Chompstation Bot	8b91a9ad50	Add a mapped-in outpost on Virgo 2	2021-07-19 21:17:09 +00:00
Chompstation Bot	1d66552392	Teshari cloak/suit/various fixes	2021-07-19 21:17:02 +00:00
Chompstation Bot	60cb1c6c96	Fixes #11138	2021-07-19 21:16:56 +00:00
Aronai Sieyes	6cb41c6372	Merge pull request #11147 from VOREStation/Arokha/supermatter ... Allow grinding supermatter	2021-07-19 21:16:49 +00:00
Chompstation Bot	dc1328d93c	Fixes Talon being referred to as if ITV is a company	2021-07-19 15:12:30 +00:00
Nadyr	5ce4add0c9	Merge pull request #2586 from CHOMPStationBot/upstream-merge-11085 ... [MIRROR] Fixes #11081	2021-07-18 18:33:27 -04:00
Nadyr	2ddceccf2b	Merge pull request #2585 from CHOMPStationBot/upstream-merge-11116 ... [MIRROR] Do speedboost text with zany regex	2021-07-18 18:32:44 -04:00
Nadyr	be3982365d	Merge pull request #2584 from CHOMPStationBot/upstream-merge-11113 ... [MIRROR] Shork sprites for aether suit and commonwealth suit dispenser	2021-07-18 18:32:20 -04:00
Nadyr	aadc2ea245	Merge pull request #2583 from CHOMPStationBot/upstream-merge-11133 ... [MIRROR] Fixes #11127	2021-07-18 18:31:46 -04:00
Nadyr	7ab2727d7a	Merge pull request #2582 from CHOMPStationBot/upstream-merge-11134 ... [MIRROR] Fixes #11102	2021-07-18 18:30:24 -04:00
Nadyr	2099d5b9d0	Merge pull request #2581 from CHOMPStationBot/upstream-merge-11135 ... [MIRROR] Fix inventory oversights	2021-07-18 18:29:54 -04:00
Nadyr	57c45fe8b6	Merge pull request #2579 from CHOMPStationBot/upstream-merge-11131 ... [MIRROR] Fixes #11118	2021-07-18 18:28:10 -04:00
Aronai Sieyes	0aa9bf3b91	Merge pull request #11085 from MarinaGryphon/bugfix/11081 ... Fixes #11081	2021-07-18 19:33:01 +00:00
Aronai Sieyes	e34bfd5685	Merge pull request #11116 from VOREStation/Arokha/speedboost ... Do speedboost text with zany regex	2021-07-18 19:31:53 +00:00
Aronai Sieyes	78395a2e3e	Merge pull request #11113 from VOREStation/Arokha/dispmob ... Shork sprites for aether suit and commonwealth suit dispenser	2021-07-18 19:25:42 +00:00
Novacat	2840252569	Merge pull request #11133 from VOREStation/Fixes/11127 ... Fixes #11127	2021-07-18 19:16:26 +00:00
Novacat	12e53279a4	Merge pull request #11134 from VOREStation/Fixes/11102 ... Fixes #11102	2021-07-18 19:16:20 +00:00
Novacat	ec8ed94bf4	Merge pull request #11135 from VOREStation/Arokha/backpackgc ... Fix inventory oversights	2021-07-18 19:15:13 +00:00
Novacat	a682e0c5c1	Merge pull request #11131 from VOREStation/Fixes/11118 ... Fixes #11118	2021-07-18 19:14:58 +00:00
Novacat	0bcc9b42e7	Merge pull request #11132 from VOREStation/Fixes/11129 ... Fixes #11129	2021-07-18 19:14:51 +00:00
Nadyr	6aa3ed2345	Merge pull request #2574 from CHOMPStationBot/upstream-merge-11115 ... [MIRROR] Fix bioprinter alert box	2021-07-17 18:11:05 -04:00
Novacat	5efcc8488b	Merge pull request #11115 from VOREStation/Fixes/11114 ... Fix bioprinter alert box	2021-07-17 14:25:35 +00:00
Novacat	b456b5287b	Merge pull request #11121 from KillianKirilenko/kk-fixes2 ... Fix Agent IDs	2021-07-17 14:24:27 +00:00
Nadyr	02aee304a2	powder that makes you say yes	2021-07-16 19:11:29 -04:00
Nadyr	5c7226fa54	Merge branch 'master' into upstream-merge-11110	2021-07-16 19:09:43 -04:00
Nadyr	9938e4cf9f	Merge pull request #2570 from CHOMPStationBot/upstream-merge-11100 ... [MIRROR] Convert some bools to TRUE/FALSE instead of 1/0.	2021-07-16 19:06:23 -04:00
Nadyr	b4d0e07229	powder that makes you say yes	2021-07-16 18:36:36 -04:00
Nadyr	f4ffa9f8be	powder that makes you say yes	2021-07-16 18:30:48 -04:00