Skip to content

Commit

Permalink
Makes the wizard's pets not fight to the death (tgstation#81412)
Browse files Browse the repository at this point in the history
## About The Pull Request

Adds the `"Wizard"` to the wizard's pets Jimmy and Jommy, preventing
Jimmy from killing Jommy and trying to kill his owner.

Fixes tgstation#81410

## Why It's Good For The Game

The wizard federation is supposed to train their pets better than this.

## Changelog
:cl:
fix: The wizard's pets Jimmy and Jommy no longer fight to the death.
/:cl:
  • Loading branch information
Thunder12345 authored Feb 11, 2024
1 parent 1f95d16 commit 6047756
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions _maps/templates/lazy_templates/wizard_den.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,8 @@
"nV" = (
/obj/structure/flora/bush/fullgrass/style_random,
/mob/living/simple_animal/hostile/ooze/gelatinous{
name = "Jimmy"
name = "Jimmy";
faction = list("slime", "Wizard")
},
/turf/open/floor/grass,
/area/centcom/wizard_station)
Expand Down Expand Up @@ -536,7 +537,8 @@
/area/centcom/wizard_station)
"AW" = (
/mob/living/simple_animal/pet/gondola{
name = "Jommy"
name = "Jommy";
faction = list("gondola", "Wizard")
},
/obj/structure/flora/bush/fullgrass/style_random,
/turf/open/floor/grass,
Expand Down

0 comments on commit 6047756

Please sign in to comment.