CHOMPStation2

mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00

Files

Erthilo 3510a8adf0 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	code/defines/obj/hydro.dm
	code/game/mecha/mecha.dm
	code/game/objects/devices/PDA/PDA.dm
	code/game/objects/devices/flashlight.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/papers_bins.dm
	code/game/objects/radio/radio.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/mob.dm

2012-08-23 13:56:12 +01:00

area

rename and rework some xenoarch files slightly, some compile fixes (WIP integration)

2012-08-22 21:30:21 +10:00

mob/living/carbon

Merge branch 'tg' into bs12_with_tgport

2012-08-22 18:39:44 +10:00

obj

Ultralight update, less laggy and less buggy. Might still need to be removed, time will tell. Also: Added an Ion Storm law, and reverted the radio mode change back to the new subspace radios. Also added myself to the admins.txt since I am a dev again and the main server already is updated like that.

2012-08-21 17:25:57 -07:00

procs

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates