From 7f88ef6b25ba4e9ff68d3db20861de69034692a2 Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Sun, 14 Aug 2016 22:00:54 -0400 Subject: [PATCH] Multiple bugfixes (#477) * Allows ID's to be worn in ears * Fixes being unable to pick up micros * Fixes a stomach problem Examine text wasn't showing from 850 1199 --- .../objects/items/weapons/cards_ids_vr.dm | 2 + .../mob/living/carbon/human/examine_vr.dm | 4 +- code/modules/vore/resizing/resize_vr.dm | 42 +++++++++---------- vorestation.dme | 1 + 4 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 code/game/objects/items/weapons/cards_ids_vr.dm diff --git a/code/game/objects/items/weapons/cards_ids_vr.dm b/code/game/objects/items/weapons/cards_ids_vr.dm new file mode 100644 index 0000000000..123cb199e1 --- /dev/null +++ b/code/game/objects/items/weapons/cards_ids_vr.dm @@ -0,0 +1,2 @@ +/obj/item/weapon/card/id + slot_flags = SLOT_ID | SLOT_EARS \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 8e35d7ab72..22a9e5e0a0 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -91,7 +91,7 @@ message = "[t_He] [t_is] extremely hungry. A deep growl occasionally rumbles from [t_his] empty stomach.\n" if(100 to 499) return message //Well that's pretty normal, really. - if(500 to 864) // Fat. + if(500 to 1199) // Fat. message = "[t_He] [t_has] a stuffed belly, bloated fat and round from eating too much.\n" if(1200 to 1934) // One person fully digested. message = "[t_He] [t_is] sporting a large, round, sagging stomach. It's contains at least their body weight worth of glorping slush.\n" @@ -110,4 +110,4 @@ var/datum/belly/B = vore_organs[I] message += B.get_examine_msg() - return message \ No newline at end of file + return message diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index b688e36c7b..0391b03e40 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -77,22 +77,22 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 ([src ? "JMP" : "null"])") /** Add the set_size() proc to usable verbs. */ -/hook/living_new/proc/resize_setup(mob/living/M) - M.verbs += /mob/living/proc/set_size +/hook/living_new/proc/resize_setup(mob/living/H) + H.verbs += /mob/living/proc/set_size return 1 /** * Attempt to scoop up this mob up into M's hands, if the size difference is large enough. * @return false if normal code should continue, 1 to prevent normal code. */ -/mob/living/proc/attempt_to_scoop(var/mob/living/carbon/human/M) - if(!istype(M)) +/mob/living/proc/attempt_to_scoop(var/mob/living/carbon/human/H) + if(!istype(H)) return 0; - if(M.buckled) - usr << "You have to unbuckle \the [M] before you pick them up." + if(H.buckled) + usr << "You have to unbuckle \the [H] before you pick them up." return 0 - if(M.get_effective_size() - src.get_effective_size() >= 0.75) - var/obj/item/weapon/holder/m_holder = get_scooped(M) + if(H.get_effective_size() - src.get_effective_size() >= 0.75) + var/obj/item/weapon/holder/m_holder = get_scooped(H) if (m_holder) return 1 else @@ -112,16 +112,16 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 if(abs(src.get_effective_size() - tmob.get_effective_size()) >= 0.75) now_pushing = 0 if(src.get_effective_size() > tmob.get_effective_size()) - var/mob/living/carbon/human/M = src - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + var/mob/living/carbon/human/H = src + if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You carefully slither around [tmob]." tmob << "[src]'s huge tail slithers past beside you!" else src << "You carefully step over [tmob]." tmob << "[src] steps over you carefully!" if(tmob.get_effective_size() > src.get_effective_size()) - var/mob/living/carbon/human/M = tmob - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + var/mob/living/carbon/human/H = tmob + if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You jump over [tmob]'s thick tail." tmob << "[src] bounds over your tail." else @@ -146,8 +146,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 src.forceMove(tmob.loc) tmob.Stun(4) - var/mob/living/carbon/human/M = src - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + var/mob/living/carbon/human/H = src + if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You carefully squish [tmob] under your tail!" tmob << "[src] pins you under their tail!" else @@ -161,8 +161,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 src.forceMove(tmob.loc) tmob.apply_damage(10, HALLOSS) - var/mob/living/carbon/human/M = src - if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + var/mob/living/carbon/human/H = src + if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You steamroller over [tmob] with your heavy tail!" tmob << "[src] ploughs you down mercilessly with their heavy tail!" else @@ -175,17 +175,17 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 now_pushing = 0 src.forceMove(tmob.loc) - var/mob/living/carbon/human/M = src - if(istype(M) && !M.shoes) + var/mob/living/carbon/human/H = src + if(istype(H) && !H.shoes) // User is a human (capable of scooping) and not wearing shoes! Scoop into foot slot! - equip_to_slot_if_possible(tmob.get_scooped(M), slot_shoes, 0, 1) - if(istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + equip_to_slot_if_possible(tmob.get_scooped(H), slot_shoes, 0, 1) + if(istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You wrap up [tmob] with your powerful tail!" tmob << "[src] binds you with their powerful tail!" else src << "You clench your toes around [tmob]'s body!" tmob << "[src] grabs your body with their toes!" - else if(istype(M) && istype(M.tail_style, /datum/sprite_accessory/tail/taur/naga)) + else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga)) src << "You carefully squish [tmob] under your tail!" tmob << "[src] pins you under their tail!" else diff --git a/vorestation.dme b/vorestation.dme index f291ccf819..f8b335abb9 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -825,6 +825,7 @@ #include "code\game\objects\items\weapons\candle.dm" #include "code\game\objects\items\weapons\cards_ids.dm" #include "code\game\objects\items\weapons\cards_ids_syndicate.dm" +#include "code\game\objects\items\weapons\cards_ids_vr.dm" #include "code\game\objects\items\weapons\cigs_lighters.dm" #include "code\game\objects\items\weapons\clown_items.dm" #include "code\game\objects\items\weapons\cosmetics.dm"