9158 Commits

Author	SHA1	Message	Date
Poojawa	d71f37167f	I'm about to go fucking APE ... None of this is actually viable, Footprints aren't taking proper color, aren't updating their color. It's just default red. screm	2019-08-16 04:58:16 -05:00
Poojawa	264cbf8108	reverts the add_blood back to add_blood_DNA	2019-08-15 12:49:10 -05:00
Poojawa	0290a46ddc	Impliments Ghom review, reverts blood list back to component	2019-08-15 12:32:44 -05:00
Poojawa	2073921f4b	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-08-15 08:39:41 -05:00
kevinz000	2cdfa9cf2f	Merge pull request #9126 from Sishen1542/viro-cures ... Adds more variety in virus cures, more consistent difficulty scaling.	2019-08-15 01:12:12 -07:00
deathride58	5f6a110f73	Merge pull request #9052 from Citadel-Station-13/kevinz000-patch-71 ... Hmm, today the Hierophant will go sicko mode on shaft miners.	2019-08-14 15:43:51 -04:00
deathride58	2406254faa	Merge pull request #9100 from cebutris/got-milk ... Breasts no longer lactate by default, Lactation is now a preference	2019-08-14 15:40:53 -04:00
deathride58	089a613683	Merge pull request #9098 from cebutris/tea-fix ... Fixes Tea Aspera	2019-08-14 15:31:46 -04:00
deathride58	2302e24255	Merge pull request #9116 from Citadel-Station-13/kevinz000-patch-73 ... Changes beforeShuttleMove on airlock to addtimer(0) rather than InvokeAsync	2019-08-14 15:10:49 -04:00
deathride58	5a4d0a73ce	Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67 ... Fixes/tweaks jump boots	2019-08-14 15:00:36 -04:00
Sishen	382487fdc2	viruseseses-cures	2019-08-13 05:32:37 -04:00
kevinz000	411e0cc2cc	Update on_move.dm	2019-08-12 00:17:31 -07:00
Fermi	51a6ae96a0	R.data	2019-08-12 00:37:57 +01:00
Fermi	c0bbb099f8	Fixes disappearing chems.	2019-08-12 00:36:45 +01:00
kevinz000	a971390cff	Merge pull request #8992 from jakeramsay007/Helmet-Internals ... [READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.	2019-08-11 10:15:49 -07:00
kevinz000	d3b3836d33	Merge pull request #9010 from BurgerLUA/Actual-War-Ops ... War Ops now informs the crew where the Nuclear Device is located when activated.	2019-08-11 10:13:02 -07:00
kevinz000	123b478edd	Merge pull request #8927 from Ghommie/Ghommie-cit151 ... Tones down some items attack stamina costs. kills hypereutactic blades copypasta.	2019-08-11 10:12:20 -07:00
kevinz000	b75c82b4ee	Merge pull request #9054 from Sishen1542/stando ... stands now remove trait_nodeath from their user if given by memento mori	2019-08-11 10:11:11 -07:00
kevinz000	96842ed1c3	Merge pull request #9075 from Ghommie/Ghommie-cit184 ... Removes a redunant Remove() from high luminosity eyes.	2019-08-11 10:05:58 -07:00
kevinz000	cba8d3478a	Merge pull request #9079 from Sishen1542/lingblade ... gives ling armblade 20 armor pen to make it more in line with eswords	2019-08-11 10:01:10 -07:00
kevinz000	a576e71a01	Merge pull request #9101 from Sishen1542/stealthy-surgery ... obfuscates specific surgeries, gives generalized areas to anybody in viewing range	2019-08-11 09:59:29 -07:00
kevinz000	b2eda962d1	Merge pull request #9093 from MrJWhit/Change-IAA-Text ... Adds a line in the spawntext for IAA	2019-08-11 08:34:21 -07:00
Sishen	23d4b9827d	fix, yadda yadda	2019-08-11 01:19:37 -04:00
Poojawa	dcd682bd59	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-08-10 23:48:47 -05:00
BlackMajor	5dcd419d8a	Merge pull request #8356 from Thalpy/master ... [READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.	2019-08-11 16:09:23 +12:00
Cebutris	df136ab96c	lactation is now a preference	2019-08-10 23:28:16 -04:00
Cebutris	d77360c794	gives tea aspera proper reagents	2019-08-10 19:32:12 -04:00
Sishen	51011ccf97	Update guardian.dm	2019-08-10 07:05:53 -04:00
Sishen	15dbb7ff32	Update guardian.dm	2019-08-10 07:03:45 -04:00
Sishen	b0a28d1a29	Update mutations.dm	2019-08-10 02:16:07 -04:00
kevinz000	b3b22029a6	Merge pull request #9064 from cebutris/hugloves ... Hugs of the North Star	2019-08-09 22:20:18 -07:00
kevinz000	74008beb8f	Merge pull request #9066 from Ghommie/Ghommie-cit181 ... Two lines fixes for invisible zipties and borked legcuffs.	2019-08-09 22:17:31 -07:00
kevinz000	f516fcf539	Merge pull request #9083 from Trilbyspaceclone/fruit ... Strawbarries, and more	2019-08-09 22:16:34 -07:00
kevinz000	b213b0ed2b	Merge pull request #9084 from Ghommie/Ghommie-cit185 ... Fixes clock cult mass recall.	2019-08-09 22:16:09 -07:00
kevinz000	14033d9876	Merge pull request #9085 from Ghommie/Ghommie-cit186 ... underwear colors fix 2: The revenge of the crunch.	2019-08-09 22:15:55 -07:00
MrJWhit	77e0551616	Adds a line in the spawntext for IAA ... Adds "By no means reveal that you, or any other NT employees, are undercover agents." at the spawntext	2019-08-09 13:56:07 -04:00
Ghommie	ee57720ee3	underwear colors fix 2: The revenge of the crunch.	2019-08-09 05:11:12 +02:00
Ghommie	eb3ae1d61a	Fixes clock cult mass recall.	2019-08-09 04:05:06 +02:00
Sishen	1fc69a13a4	okay fixed	2019-08-08 22:02:12 -04:00
Ghommie	12c4fc139d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit151	2019-08-09 04:00:23 +02:00
Poojawa	98a279a6db	likely fixes the examine bug lol	2019-08-08 17:45:01 -05:00
Poojawa	283b5d050e	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods	2019-08-08 16:51:53 -05:00
TrilbySpaceClone	ab13b62bdd	fruits of labor	2019-08-08 16:14:04 -04:00
Fermi	1fb07e286a	Removing reviewer comments incase of fullmerge.	2019-08-08 19:53:07 +01:00
BurgerLua	9566caa527	Added	2019-08-08 09:25:04 -07:00
Sishen	582b355224	Update guardian.dm	2019-08-08 11:00:23 -04:00
Fermi	004b79d4cd	Vodka is alkaline	2019-08-08 15:31:07 +01:00
kevinz000	8b20413676	Merge pull request #9069 from Ghommie/Ghommie-cit183 ... Fixes cults teleportations.	2019-08-08 01:58:48 -07:00
Sishen	1f05123816	ook ook	2019-08-08 03:04:51 -04:00
Ghommie	df5366e911	Removes a redunant Remove() from high luminosity eyes.	2019-08-08 05:06:53 +02:00