Commit Graph

11 Commits

Author SHA1 Message Date
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
DeityLink
ed02be9f0d null rod buffs part 2 2014-11-03 04:14:08 +01:00
d3athrow
53298e9d8d Merge pull request #1665 from DeityLink/Corgi-UI-and-behaviour
Corgi UI and player-controlled behaviours
2014-10-08 00:11:07 -05:00
DeityLink
3cd4856d5f Corgi UI and player-controlled behaviours
-Corgi now have their very own HUD
-Corgi health upped from 20hp (simple_animal default) to 30hp (still
half of a MoMMi's health)
-player-controlled corgis can now eat food by clicking on it. They can
swallow a food\snack item after 5 bites. Doing so gives them back 1/6 of
their full health (5 HP of 30HP)
-when player-controlled, simple_animals won't randomly move or speak
anymore (this behaviour now only happens when ckey == "null")
-player-controlled corgis now have a verb that allows them to perform
Ian's high speed tail chase/dance. Can be performed while moving for
extra kek.

I plan on giving players a way to play as corgis, something based on the
combined use of a soulstone and a lazarus injector. In the meantime,
it's still useful during adminbus.
2014-10-08 06:47:25 +02:00
DeityLink
343d86d258 Shade UI
For some reason I couldn't make the Pull1 icon appear when the shade is
pulling something, despite using the same lines as with the construct UI
code. So instead I made the icon show all the time. If someone can make
it work properly that'd be great.
2014-10-07 18:45:08 +02:00
Chris
c0f96ae272 Revert Click code cleanup (reverted from commit 439bda24bc) 2014-09-18 15:36:38 -05:00
Wild Bill
439bda24bc Click code cleanup 2014-09-18 14:07:50 +03:00
Chris
0619e601cd construct UI 2014-09-13 12:05:10 -05:00
Rob Nelson
acf0d26b9b Revert two-ear system from Bay. 2014-02-02 15:57:33 -08:00
Rob Nelson
e05d91d388 Fix MoMMIs. 2014-01-17 19:39:37 -08:00
Rob Nelson
27e1c5e869 ONCLICK CODE PORT. GOD HELP US ALL. 2014-01-17 18:24:53 -08:00