Commit Graph

23 Commits

Author SHA1 Message Date
Rob Nelson
22a2df1115 Standardize HULK.
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
2014-01-21 22:45:40 -05:00
Rob Nelson
95cc6a27b5 Standardize mutation constants, remove ambiguity, remove non-implemented muts.
Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
2014-01-21 22:36:19 -05:00
ZomgPonies
bc9f8f6691 Moar Xeno bugfixes 2014-01-19 19:16:52 -05:00
ZomgPonies
65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies
86e3c1d25f Alien auto ranged attacks + intent fixes 2014-01-19 11:16:47 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
errorage
eeeb68638f Partial commit for the cyborg UI upgrade, which gets rid of the pop-up window for module selection, instead displaying the available modules in storage-item like fashion.
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/robot.dm
	code/game/objects/items.dm
	code/modules/mob/living/silicon/robot/inventory.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2014-01-06 20:57:04 -05:00
ZomgPonies
6f3aef97e5 Merge pull request #103 from alex-gh/mech_inv_fix
mecha fixes
2014-01-03 11:17:42 -08:00
ZomgPonies
4bf60f4bbb AI and borgs leave hiddenprints 2014-01-03 14:11:14 -05:00
DJSnapshot
8f9e08150e mecha fixes 2014-01-02 20:51:47 +01:00
ZomgPonies
eadcfa3be9 Cannot rotate while unconscious or dead 2013-12-25 07:09:50 -05:00
ZomgPonies
9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies
0f885c3afa Item attack logging was reversed 2013-12-15 05:07:09 -05:00
ZomgPonies
591cfd1394 Better logging 2013-12-15 03:15:40 -05:00
ZomgPonies
87c56b4b23 Vampire commit 2 2013-12-14 05:19:54 -05:00
ZomgPonies
ebb29c625e Custom HUD colors 2013-11-30 18:30:18 -05:00
ZomgPonies
2625f1d6f9 Suit storage close button fix 2013-11-30 05:32:09 -05:00
ZomgPonies
3273ab1418 Econ and hud fixes 2013-11-25 06:12:56 -05:00
ZomgPonies
bdbfc227c6 Adminghosts can now interact with machines 2013-11-09 09:52:21 -05:00
ZomgPonies
8a4ae68fc3 Update icon fixes 2013-11-03 04:07:45 -05:00
ZomgPonies
00b101d7f2 Seperated ID and PDA slots 2013-11-01 13:28:58 -04:00
ZomgPonies
5e3b4a7f02 Alien HUD update, now with 100% more plasma UI 2013-10-30 06:37:46 -04:00
ZomgPonies
1d9537bbdc New click code 2013-10-12 14:43:56 -04:00