cib fb60301594 Revert "Revert's cib's BS12 merge by XSI's orders" ...

This reverts commit a6e7c085ef.

Conflicts:

	baystation12.dme
	code/datums/organs/organ_external.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/mob_defines.dm
	code/setup.dm
	icons/mob/dam_human.dmi
	icons/mob/human.dmi

2012-10-11 14:31:31 -07:00

..

_DynamicAreaLighting_TG.dm

Proper fix for the area-luminosity bug. It seems the issue was a > instead of a >=. Meaning that most pitch-black areas were not having luminosity set to 0.

2012-09-24 06:40:10 +00:00

configuration.dm

Revert "Revert's cib's BS12 merge by XSI's orders"

2012-10-11 14:31:31 -07:00

failsafe.dm

Failsafe added to the debug/restart controller verbs.dm

2012-09-10 12:53:55 +00:00

lighting_controller.dm

Replaced the master_controller with the WIP sequential version.

2012-08-31 04:14:26 +00:00

master_controller.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00

shuttle_controller.dm

Attack logging, better intent switcher HUD, alien species fixes, misc admin commands, moderator commands.

2012-09-24 17:56:49 +01:00

tensioner.dm

…

verbs.dm

Failsafe added to the debug/restart controller verbs.dm

2012-09-10 12:53:55 +00:00

voting.dm

Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode).

2012-09-24 11:40:41 +00:00