cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
01d2471fc99d186b70213110428cc3a9f3489b5b
vgstation13/code/datums/diseases
History
D3athrow 01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
..
advance
drop_item and click code.
2015-04-12 00:56:43 +01:00
alien_embryo.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
appendicitis.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
beesease.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
brainrot.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
cold9.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
cold.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
dna_spread.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
fake_gbs.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
flu.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
fluspanish.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
gbs.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
jungle_fever.dm
Replacing monkie with monkey...
2011-11-28 19:39:22 +00:00
magnitis.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
mega_kingston.dm
Fucking file
2014-06-12 20:45:34 -07:00
pierrot_throat.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
plasmatoid.dm
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e
2010-08-23 14:29:20 +00:00
retrovirus.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
rhumba_beat.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
robotic_transformation.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
wizarditis.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00
xeno_transformation.dm
Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
2015-04-12 16:40:59 -05:00