Commit Graph
115 Commits
Author SHA1 Message Date
Rob NelsonandZomgPonies 7832e1c26f PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN
Conflicts:
	.gitignore
	baystation12.dme
	code/_onclick/hud/screen_objects.dm
	code/modules/clothing/spacesuits/alien.dm
	code/modules/media/tapedeck.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	html/changelog.html
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/in-hand/in-hand_sync_report.txt
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/tank.dmi
2014-07-31 18:58:49 -04:00
ZomgPonies 5b5af35dc9 UI fixes for new AI photography 2014-07-31 17:43:28 -04:00
ZomgPonies 431ab486b3 Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row) 2014-07-23 11:04:07 -04:00
ZomgPonies 60b0659d43 Made update_power be at mob level since spells are at that level. 2014-07-18 12:11:13 -04:00
ZomgPonies 5bd725af44 More work on spell action buttons. 2014-07-16 02:48:54 -04:00
ZomgPonies ccb425bd44 Preperation for spell action buttons 2014-07-15 11:20:43 -04:00
ZomgPonies 1eb02b5cf4 Overhauled holsters and webbings 2014-07-15 04:02:24 -04:00
KeleniusandZomgPonies 8b6bd9dca5 usr -> user
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/objects/items/devices/PDA/PDA.dm
2014-07-13 15:25:11 -04:00
KeleniusandZomgPonies b6c6138c44 Gives the AI a hud
Conflicts:
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/screen_objects.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/say.dm
	code/modules/paperwork/photography.dm
2014-07-13 15:20:08 -04: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
errorageandZomgPonies 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
DJSnapshotandalex-gh 8f9e08150e mecha fixes 2014-01-02 20:51:47 +01:00
ZomgPonies 2625f1d6f9 Suit storage close button fix 2013-11-30 05:32:09 -05:00
ZomgPonies 1d9537bbdc New click code 2013-10-12 14:43:56 -04:00