Paradise

mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00

Files

Tigercat2000 519992b5a9 Merge branch 'byond510'

Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme

2016-04-01 14:15:44 -07:00

singularity

Replace text2list and list2text

2016-02-28 12:07:19 -08:00

supermatter

meanwhile as i driver tiger INSANE

2016-02-25 16:17:39 -05:00

tesla

Balances the Tesla

2016-01-07 16:43:38 -05:00

apc.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor