simple animals now accept reagents #18339

MadmanMartian · 2018-05-23T15:55:44Z

mobs can now accept reagents unless they're holographic/stone/etc
mobs now metabolize reagents they have inside them. Now the mouse can eat food for nutriment and it feed them over time.
closes #16598
closes #16597
medical nanobots can now turn mobs into cyber horror mobs, for more grey goo possibilities

🆑

rscadd: Following extensive medical testing, we've found that healing chemicals can be animal friendly.
rscadd: After some tweaks to the base design of medical nanobots, they can now adapt and repair more than just humans

IconDiffBot · 2018-05-23T15:56:04Z

Icons with diff:

icons/mob/animal.dmi

Key	Old	New	Status
plasma_cyber_horror[20]			Removed
cyber_horror[2]			Removed
ling_cyber_horror[3]			Removed
ling_cyber_horror			Removed
cyber_horror_dead[1]			Removed
vox_cyber_horror[1]			Removed
plasma_cyber_horror[6]			Removed
plasma_cyber_horror[5]			Removed
grey_cyber_horror[2]			Removed
tajaran_cyber_horror[2]			Removed
plasma_cyber_horror[2]			Removed
plasma_cyber_horror[16]			Removed
plasma_cyber_horror[21]			Removed
tajaran_cyber_horror			Removed
grey_cyber_horror[3]			Removed
cyber_horror			Removed
plasma_cyber_horror[4]			Removed
grey_cyber_horror			Removed
plasma_cyber_horror[14]			Removed
plasma_cyber_horror[22]			Removed
plasma_cyber_horror[7]			Removed
plasma_cyber_horror[12]			Removed
vox_cyber_horror[3]			Removed
plasma_cyber_horror[8]			Removed
plasma_cyber_horror[23]			Removed
plasma_cyber_horror[18]			Removed
cyber_horror[3]			Removed
cyber_horror[1]			Removed
grey_cyber_horror[1]			Removed
cyber_horror_dead			Removed
ling_cyber_horror[1]			Removed
cyber_horror_dead[2]			Removed
vox_cyber_horror			Removed
plasma_cyber_horror[13]			Removed
plasma_cyber_horror[10]			Removed
plasma_cyber_horror[9]			Removed
tajaran_cyber_horror[3]			Removed
plasma_cyber_horror[19]			Removed
plasma_cyber_horror[15]			Removed
plasma_cyber_horror[11]			Removed
plasma_cyber_horror[1]			Removed
plasma_cyber_horror			Removed
vox_cyber_horror[2]			Removed
tajaran_cyber_horror[1]			Removed
plasma_cyber_horror[17]			Removed
plasma_cyber_horror[3]			Removed
cyber_horror_dead[3]			Removed
ling_cyber_horror[2]			Removed

icons/mob/cyber_horror.dmi

Key	Old	New	Status
mouse_brown[1]			Created
plasma_cyber_horror[17]			Created
vox_cyber_horror			Created
corgi_dead			Created
plasma_cyber_horror[14]			Created
vox_cyber_horror[2]			Created
cyber_horror_dead[1]			Created
grey_cyber_horror[2]			Created
corgi			Created
cat[5]			Created
cat[7]			Created
ling_cyber_horror[2]			Created
ling_cyber_horror[3]			Created
plasma_cyber_horror[20]			Created
plasma_cyber_horror[22]			Created
plasma_cyber_horror[11]			Created
plasma_cyber_horror[16]			Created
cat[6]			Created
tajaran_cyber_horror			Created
plasma_cyber_horror[15]			Created
plasma_cyber_horror[7]			Created
plasma_cyber_horror[9]			Created
cat[1]			Created
corgi[1]			Created
plasma_cyber_horror[19]			Created
cat_dead			Created
mouse_brown_dead			Created
mouse_brown_splat			Created
ling_cyber_horror[1]			Created
plasma_cyber_horror[13]			Created
vox_cyber_horror[3]			Created
cyber_horror_dead			Created
grey_cyber_horror[1]			Created
mouse_brown			Created
ling_cyber_horror			Created
cat[2]			Created
corgi[3]			Created
vox_cyber_horror[1]			Created
grey_cyber_horror[3]			Created
mouse_brown_sleep			Created
plasma_cyber_horror[4]			Created
plasma_cyber_horror[1]			Created
cyber_horror[3]			Created
cyber_horror			Created
plasma_cyber_horror			Created
plasma_cyber_horror[8]			Created
plasma_cyber_horror[23]			Created
plasma_cyber_horror[18]			Created
plasma_cyber_horror[3]			Created
cyber_horror_dead[3]			Created
mouse_brown[2]			Created
cyber_horror[2]			Created
cat[4]			Created
tajaran_cyber_horror[2]			Created
grey_cyber_horror			Created
plasma_cyber_horror[5]			Created
plasma_cyber_horror[10]			Created
cyber_horror_dead[2]			Created
cyber_horror[1]			Created
plasma_cyber_horror[21]			Created
mouse_brown[3]			Created
plasma_cyber_horror[12]			Created
plasma_cyber_horror[6]			Created
plasma_cyber_horror[2]			Created
cat			Created
cat[3]			Created
tajaran_cyber_horror[1]			Created
tajaran_cyber_horror[3]			Created
corgi[2]			Created

MadmanMartian · 2018-05-23T16:13:02Z

Shadowmech88 · 2018-05-23T16:29:51Z

Not that I'm saying not to do this, but I floated the idea some time ago and was told it was a bad one, which is why I went with adding a spray interaction for phazon in order to allow it to affect simple_animals.

unid15 · 2018-05-23T16:30:41Z

code/modules/reagents/Chemistry-Reagents.dm

+				if(spawning_horror == 1)
+					to_chat(M, "<b><span class='warning'>Something bursts out from inside you!</span></b>")
+					message_admins("[key_name(M)] has gibbed and spawned a new cyber horror due to nanobots. ([formatJumpTo(M)])")
+					if(ishuman(M))


have it simply call new /mob/living/simple_animal/hostile/monster/cyber_horror/monster(M.loc, M), and do this whole "ishuman(M)" thing in cyber horror's New(), since you're already doing it like this with animals

MadmanMartian · 2018-05-23T16:34:59Z

@Shadowmech88 I've done some bits to reduce the potential load. The mob_property_flags check if the mob is holographic and such, and if so they don't get a reagent container.

Shouldn't be any worse than spawning a new human, considering we have a few ways of limiting mob counts (baby checks, for instance)

jknpj · 2018-05-23T17:03:06Z

code/modules/mob/living/simple_animal/hostile/monster.dm

+	desc = "What was once \a [who_we_were], twisted by machine."
+	var/multiplier = who_we_were.reagents.has_reagent(MEDNANOBOTS)?who_we_were.reagents.get_reagent_amount(MEDNANOBOTS)/10:1
+
+	if(isanimal(who_we_were) && who_we_were:icon_living && has_icon(icon, who_we_were:icon_living))


jknpj · 2018-05-23T17:03:28Z

code/modules/mob/living/simple_animal/hostile/monster.dm

+	var/multiplier = who_we_were.reagents.has_reagent(MEDNANOBOTS)?who_we_were.reagents.get_reagent_amount(MEDNANOBOTS)/10:1
+
+	if(isanimal(who_we_were) && who_we_were:icon_living && has_icon(icon, who_we_were:icon_living))
+		icon_state = who_we_were:icon_living


hitler again

jknpj · 2018-05-23T17:03:48Z

code/modules/mob/living/simple_animal/hostile/monster.dm

+
+	if(isanimal(who_we_were) && who_we_were:icon_living && has_icon(icon, who_we_were:icon_living))
+		icon_state = who_we_were:icon_living
+		icon_living = who_we_were:icon_living


hitler 3: the revenge

Durgen · 2018-05-23T19:08:07Z

player controlled cyber horrors after transformation when?

DamianX

needs unhitlering

SonixApache · 2018-06-15T01:59:26Z

unhitler when

MadmanMartian · 2018-06-15T09:24:45Z

Monday

medical nanobots can now turn mobs into cyber horror mobs, for more grey goo

DamianX · 2018-07-09T17:44:20Z

I suppose it is Monday

addressed

MadmanMartian added the Unatomic Uncle Touches different things all at once. label May 23, 2018

MadmanMartian added Balance Potentially going to upset people as it changes balance of the game. Content Adds something. Neat! labels May 23, 2018

unid15 reviewed May 23, 2018

View reviewed changes

MadmanMartian mentioned this pull request May 23, 2018

IconDiffBot doesn't like movement states tgstation/IconDiffBot#20

Closed

jknpj reviewed May 23, 2018

View reviewed changes

DamianX previously requested changes Jun 8, 2018

View reviewed changes

MadmanMartian added 3 commits July 7, 2018 14:08

mobs can now accept reagents unless they're holographic/stone/etc.

50b2508

medical nanobots can now turn mobs into cyber horror mobs, for more grey goo

removes hitler

eed0ddb

fixes compile failure. TEST YO COMMITS

c635c28

jknpj merged commit 2e89e0b into vgstation-coders:Bleeding-Edge Jul 12, 2018

MadmanMartian deleted the cyber_horror_simple_mobs branch July 12, 2018 15:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

simple animals now accept reagents #18339

simple animals now accept reagents #18339

MadmanMartian commented May 23, 2018

IconDiffBot commented May 23, 2018 •

edited

Loading

MadmanMartian commented May 23, 2018

Shadowmech88 commented May 23, 2018

unid15 May 23, 2018 •

edited

Loading

MadmanMartian commented May 23, 2018

jknpj May 23, 2018

jknpj May 23, 2018

jknpj May 23, 2018

Durgen commented May 23, 2018

DamianX left a comment

SonixApache commented Jun 15, 2018

MadmanMartian commented Jun 15, 2018

DamianX commented Jul 9, 2018

simple animals now accept reagents #18339

simple animals now accept reagents #18339

Conversation

MadmanMartian commented May 23, 2018

IconDiffBot commented May 23, 2018 • edited Loading

MadmanMartian commented May 23, 2018

Shadowmech88 commented May 23, 2018

unid15 May 23, 2018 • edited Loading

Choose a reason for hiding this comment

MadmanMartian commented May 23, 2018

jknpj May 23, 2018

Choose a reason for hiding this comment

jknpj May 23, 2018

Choose a reason for hiding this comment

jknpj May 23, 2018

Choose a reason for hiding this comment

Durgen commented May 23, 2018

DamianX left a comment

Choose a reason for hiding this comment

SonixApache commented Jun 15, 2018

MadmanMartian commented Jun 15, 2018

DamianX commented Jul 9, 2018

IconDiffBot commented May 23, 2018 •

edited

Loading

unid15 May 23, 2018 •

edited

Loading