Bubberstation

mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00

Files

phil235 1d96ef944d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix

Conflicts:
	code/game/machinery/turrets.dm
	code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	code/modules/mob/living/carbon/alien/larva/larva.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2014-11-07 21:47:18 +01:00

area

Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam

2014-10-25 23:25:27 -07:00

gamemodes

Merge pull request #5642 from phil235/AttackAnimation

2014-11-07 18:39:27 +00:00

jobs

Players jobbanned from assistant will get random jobs assigned before everyone else, in order to attempt to mitigate abuses.

2014-10-27 16:20:11 -03:00

machinery

Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix