[MIRROR] Fixes corgi hats stuck to them forever & SAVES HALLOWEEN [MDB IGNORE] (#9070)

* Fixes corgi hats stuck to them forever & SAVES HALLOWEEN (#62318)

About The Pull Request

Corgi hats used to resist any attempts at removing them from the corgi wearing said hat. This fixes that.
Also fixes #62297 by giving carved pumpkins and blumpkins their own dog_fashion datums.
Why It's Good For The Game

Corgis are now no longer stuck to wearing one hat. Spookifies Ian for Halloween with two amazing pumpkin hats.
image
Changelog

cl
expansion: Spooky headless corgi spirits have been sighted across the Sector!
fix: fixes hats glued to corgis' heads when dressing corgis up
/cl

* Fixes corgi hats stuck to them forever & SAVES HALLOWEEN

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-10-27 17:21:15 +01:00
committed by GitHub
co-authored by Sealed101
parent 43e4b22d2d
commit b7e9a0838b
4 changed files with 41 additions and 1 deletions
+22
View File
@@ -179,3 +179,25 @@
name = "Festive REAL_NAME"
desc = "Ready to party!"
obj_icon_state = "festive"
/datum/dog_fashion/head/pumpkin/unlit
name = "Headless HoP-less REAL_NAME"
desc = "A spooky dog spirit of a beloved pet who lost their owner."
obj_icon_state = "pumpkin0"
speak = list("BOO!", "AUUUUUUU", "RAAARGH!")
emote_see = list("shambles around.", "yaps ominously.", "shivers.")
emote_hear = list("howls at the Moon.", "yaps at the crows!")
/datum/dog_fashion/head/pumpkin/lit
obj_icon_state = "pumpkin1"
/datum/dog_fashion/head/blumpkin/unlit
name = "Hue-less Headless HoP-less REAL_NAME"
desc = "An evil dog spirit of a beloved pet that haunts your treats pantries!"
obj_icon_state = "blumpkin0"
speak = list("BOO!", "AUUUUUUU", "RAAARGH!")
emote_see = list("shambles around.", "yaps ominously.", "shivers.")
emote_hear = list("howls at the Moon.", "yaps at the crows!", "growls eerily!")
/datum/dog_fashion/head/blumpkin/lit
obj_icon_state = "blumpkin1"
+18
View File
@@ -196,6 +196,7 @@
flags_cover = HEADCOVERSEYES
light_color = "#fff2bf"
worn_y_offset = 1
dog_fashion = /datum/dog_fashion/head/pumpkin/unlit
/obj/item/clothing/head/hardhat/pumpkinhead/set_light_on(new_value)
. = ..()
@@ -213,6 +214,14 @@
if(light_on && !isinhands)
. += emissive_appearance(icon_file, "carved_pumpkin-emissive", alpha = src.alpha)
/obj/item/clothing/head/hardhat/pumpkinhead/turn_on(mob/user)
. = ..()
dog_fashion = /datum/dog_fashion/head/pumpkin/lit
/obj/item/clothing/head/hardhat/pumpkinhead/turn_off(mob/user)
. = ..()
dog_fashion = /datum/dog_fashion/head/pumpkin/unlit
/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
name = "carved blumpkin"
desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists."
@@ -220,6 +229,15 @@
inhand_icon_state = "hardhat0_blumpkin"
hat_type = "blumpkin"
light_color = "#76ff8e"
dog_fashion = /datum/dog_fashion/head/blumpkin/unlit
/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_on(mob/user)
. = ..()
dog_fashion = /datum/dog_fashion/head/blumpkin/lit
/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_off(mob/user)
. = ..()
dog_fashion = /datum/dog_fashion/head/blumpkin/unlit
/obj/item/clothing/head/hardhat/reindeer
name = "novelty reindeer hat"
@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
corgi_source.place_on_head(equipping, user)
/datum/strippable_item/corgi_head/finish_unequip(atom/source, obj/item/equipping, mob/user)
/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user)
var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
if (!istype(corgi_source))
return
Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 19 KiB