4 Commits

Author	SHA1	Message	Date
nemvar	a148cae769	Kills obj/item/projectile in favour of obj/projectile (#46692) ... * Kills obj/item/projectile in favour of obj/projectile * Resolves conflicts properly * fixes that one map * it lives	2019-10-06 13:37:24 -04:00
Time-Green	35738909fc	Fixes some inconsistencies in genetics (#43583) ... * Adds chromosome interactions with more mutations * Makes upgrades affect printing cooldown * Fixes a runtime with monkey dna and human eyes	2019-04-16 21:32:30 +12:00
Time-Green	442bfdeca5	changes geladikinetic creation to geladikinesis ... honestly its a mouthfull	2019-01-28 15:13:32 +01:00
Time-Green	9861efde71	Cryokinesis and Geladikinesis mutations (#42453) ... * Adds cryokinesis and renames the cold resistence file to space adaptation * adds cryokinesis * fixes icon conflict is there actually a proper way to fix them thats not copying master and reimplimenting your own sprites? * fixes a typo and lowers instability of cryokines by 5 * Apply suggestions from code review Co-Authored-By: Time-Green <timkoster1@hotmail.com> * maybe reverts line ending? * unfucks flags? * probably unfucks line endings i swear to fucking god why does it even do this. i never even touched the file and reverting it to master doesnt do anything. fuck you git	2019-01-23 15:20:56 -05:00