Skip to content

Commit

Permalink
adds additional content for nono (MrMelbert#342)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlrauneWoD authored Sep 11, 2023
1 parent e03b8fb commit d573e1e
Show file tree
Hide file tree
Showing 10 changed files with 137 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_thorns"

/datum/sprite_accessory/hair/himepaper2
name = "Princely Hime Cut"
icon = 'maplestation_modules/icons/mob/human_face.dmi'
icon_state = "hair_princely"

/datum/sprite_accessory/ears/cat/cyber
name = "Cybernetic Cat"
icon_state = "catcyber"
Expand Down
Binary file modified maplestation_modules/icons/mob/human_face.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,73 @@
icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi'
worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi'
icon_state = "nnbonnet"

// --- alter ego outfit ---

/obj/item/clothing/head/costume/crown/atrox
name = "rosed crown"
desc = "A small golden grown adorned with painted red roses. One of them looks unfinished."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi'
worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi'
icon_state = "amcrown"

/obj/item/clothing/under/jumpsuit/atrox
name = "regal red and black suit"
desc = "A regal suit that reminds you of a foul-tempered monarch. Sentence first, verdict last."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi'
worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi'
icon_state = "amsuit"
resistance_flags = INDESTRUCTIBLE
clothing_traits = list(TRAIT_VENTCRAWLER_ALWAYS, TRAIT_SHARPNESS_VULNERABLE) //suit gives same traits that nono's dress has
var/heat_mod = FALSE

/obj/item/clothing/under/jumpsuit/atrox/equipped(mob/user, slot)
. = ..()
if(!ishuman(user) || !(slot & slot_flags))
return
heat_mod = TRUE
RegisterSignal(user, COMSIG_HUMAN_BURNING, PROC_REF(on_burn))
RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
var/mob/living/carbon/human/wearer = user
wearer.physiology.burn_mod /= 0.5

/obj/item/clothing/under/jumpsuit/atrox/dropped(mob/user)
. = ..()
if(!heat_mod)
return
if(!ishuman(user) || QDELING(user))
return
var/mob/living/carbon/human/wearer = user
wearer.physiology.burn_mod *= 0.5
heat_mod = FALSE
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
UnregisterSignal(user, COMSIG_HUMAN_BURNING)
REMOVE_TRAIT(user, TRAIT_NOBREATH, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(user, TRAIT_RESISTCOLD, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(user, TRAIT_RESISTHIGHPRESSURE, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(user, TRAIT_RESISTLOWPRESSURE, VENTCRAWLING_TRAIT)

/obj/item/clothing/under/jumpsuit/atrox/proc/on_move(mob/living/carbon/human/source)
SIGNAL_HANDLER
if(HAS_TRAIT(source, TRAIT_MOVE_VENTCRAWLING))
ADD_TRAIT(source, TRAIT_NOBREATH, VENTCRAWLING_TRAIT)
ADD_TRAIT(source, TRAIT_RESISTCOLD, VENTCRAWLING_TRAIT)
ADD_TRAIT(source, TRAIT_RESISTHIGHPRESSURE, VENTCRAWLING_TRAIT)
ADD_TRAIT(source, TRAIT_RESISTLOWPRESSURE, VENTCRAWLING_TRAIT)
else
REMOVE_TRAIT(source, TRAIT_NOBREATH, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(source, TRAIT_RESISTCOLD, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(source, TRAIT_RESISTHIGHPRESSURE, VENTCRAWLING_TRAIT)
REMOVE_TRAIT(source, TRAIT_RESISTLOWPRESSURE, VENTCRAWLING_TRAIT)

/obj/item/clothing/under/jumpsuit/atrox/proc/on_burn(mob/living/carbon/human/source)
SIGNAL_HANDLER

source.apply_damage(5, STAMINA)

/obj/item/clothing/shoes/atrox
name = "regal white boots"
desc = "White boots with a heart motif. Not a single piece of dirt attaches itself to it."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_item.dmi'
worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nndress_worn.dmi'
icon_state = "amboots"
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,65 @@
icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi'
icon_state = "jokerchip"
w_class = WEIGHT_CLASS_TINY

// --- alter ego items ---

/obj/item/cane/atrox
name = "flamingo cane"
desc = "A cane with a flamingo head ontop. Used to either discipline others or play croquet."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi'
icon_state = "amcane"
inhand_icon_state = "amcane"
lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi'
righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi'
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_SMALL

/obj/structure/chair/atrox
icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi'
icon_state = "amthrone"
name = "golden plastic throne"
desc = "A shoddy throne painted red and gold. You can see some paint scratched off if you look close enough."
max_integrity = 50
item_chair = /obj/item/chair/atrox

/obj/item/chair/atrox
name = "golden plastic throne"
desc = "A relatively light throne. Better hope no one breaks your ego with it."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_structure.dmi'
icon_state = "amthrone_toppled"
inhand_icon_state = "amthrone"
lefthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_lefthand.dmi'
righthand_file = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_righthand.dmi'
w_class = WEIGHT_CLASS_NORMAL
force = 7
throw_range = 5
break_chance = 25
origin_type = /obj/structure/chair/atrox

/obj/item/storage/bag/atrox
name = "unusual red bag"
desc = "An unusual red bag carrying items that suit an unusual red prince."
icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi'
worn_icon = 'maplestation_modules/story_content/noname_equipment/icons/nnitem_item.dmi'
worn_icon_state = "ambag"
icon_state = "ambag"
w_class = WEIGHT_CLASS_NORMAL

/obj/item/storage/bag/atrox/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
atom_storage.max_total_storage = 21
atom_storage.max_slots = 7

/obj/item/storage/bag/atrox/PopulateContents() //loadout item for alter ego
var/static/items_inside = list(
/obj/item/clothing/head/costume/crown/atrox = 1,
/obj/item/clothing/under/jumpsuit/atrox = 1,
/obj/item/clothing/shoes/atrox = 1,
/obj/item/chair/atrox = 1,
/obj/item/chair/plastic = 1, //coping
/obj/item/cane/atrox = 1,
)
generate_items_inside(items_inside, src)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit d573e1e

Please sign in to comment.