kiwistation

Files

T

Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi

2015-11-02 01:06:30 -03:00

devices

Merge pull request #12497 from bgobandit/ayyyfixes

2015-10-27 18:28:48 +03:00

robot

f u c k c o n f l i c t s

2015-09-25 14:35:44 +03:00

stacks

Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts

2015-11-02 01:06:30 -03:00

weapons

Merge pull request #12678 from MMMiracles/asmartidea