diff --git a/GainStation13/code/datums/mood_events/needs_events.dm b/GainStation13/code/datums/mood_events/needs_events.dm index 880b45f95f..102a3c2d9b 100644 --- a/GainStation13/code/datums/mood_events/needs_events.dm +++ b/GainStation13/code/datums/mood_events/needs_events.dm @@ -5,3 +5,9 @@ /datum/mood_event/fat_good description = "I'm so fat!\n" mood_change = 4 + +//GS13 Port +/datum/mood_event/lewd_headpat + description = "I love headpats so much!\n" + mood_change = 3 + timeout = 2 MINUTES diff --git a/GainStation13/code/datums/traits.dm b/GainStation13/code/datums/traits.dm index 40f5b77b57..87ee915516 100644 --- a/GainStation13/code/datums/traits.dm +++ b/GainStation13/code/datums/traits.dm @@ -94,3 +94,67 @@ if(H) var/datum/species/species = H.dna.species species.disliked_food = initial(species.disliked_food) + +//GS13 Port +//Port from Shadow +/datum/quirk/donotclone + name = "DNC" + desc = "You have filed a Do Not Clone order, stating that you do not wish to be cloned. You can still be revived by other means." + value = -2 + mob_trait = TRAIT_NEVER_CLONE + medical_record_text = "Patient has a DNC (Do not clone) order on file, and cannot be cloned as a result." + +/datum/quirk/inheat + name = "In Heat" + desc = "Your system burns with the desire to be bred, your body will betray you and alert others' to your desire when examining you. Satisfying your lust will make you happy, but ignoring it may cause you to become sad and needy." + value = 0 + mob_trait = TRAIT_HEAT + gain_text = "You body burns with the desire to be bred." + lose_text = "You feel more in control of your body and thoughts." + +/datum/quirk/headpat_slut + name = "Headpat Slut" + desc = "You like headpats, alot, maybe even a little bit too much. Headpats give you a bigger mood boost and cause arousal" + mob_trait = TRAIT_HEADPAT_SLUT + value = 0 + medical_record_text = "Patient seems overly affectionate." + +/datum/quirk/headpat_hater + name = "Distant" + desc = "You don't seem to show much care for being touched. Whether it's because you're reserved or due to self control, you won't wag your tail outside of your own control should you possess one." + mob_trait = TRAIT_DISTANT + value = 0 + medical_record_text = "Patient cares little with or dislikes being touched." + +/datum/quirk/universal_diet + name = "Universal diet" + desc = "You are fine with eating just about anything normally edible, you have no strong dislikes in food. Toxic food will still hurt you, though." + value = 0 + gain_text = "You feel like you can eat any food type." + lose_text = "You start to dislike certain food types again." + medical_record_text = "Patient reports no strong dietary dislikes." + +/datum/quirk/universal_diet/add() + var/mob/living/carbon/human/H = quirk_holder + var/datum/species/species = H.dna.species + species.disliked_food = null + +/datum/quirk/universal_diet/remove() + var/mob/living/carbon/human/H = quirk_holder + if(H) + var/datum/species/species = H.dna.species + species.disliked_food = initial(species.disliked_food) + +/datum/quirk/fatness_liker //GS13 + name = "Fat Affinity" + desc = "You like being fat, alot, maybe even a little bit too much. Being fat gives you a bigger mood boost." + mob_trait = TRAIT_FAT_GOOD + value = 0 + medical_record_text = "Patient seems overly content with gaining weight." + +/datum/quirk/fatness_hater //GS13 + name = "Fat Aversion" + desc = "You dislike being fat. Being fat brings your mood down, alot." + mob_trait = TRAIT_FAT_BAD + value = 0 + medical_record_text = "Patient seems distressed by gaining weight." diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index 29efce6407..f45f9d80fb 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -171,3 +171,55 @@ icon = 'icons/obj/module.dmi' icon_state = "datadisk0" desc = "A dusty disk, desconstruction will be needed to recover data." + +//GS 13 Port - Big gulps in all sizes +/obj/item/reagent_containers/food/drinks/flask/paper_cup + name = "paper cup" + icon = 'GainStation13/icons/obj/paper_cups.dmi' + amount_per_transfer_from_this = 10 + possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) + volume = 50 + reagent_flags = OPENCONTAINER + spillable = TRUE + container_HP = 5 + pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' + drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/small + name = "Small Gulp Cup" + desc = "A paper cup. It can hold up to 50 units. It's not very strong." + icon_state = "small" + custom_materials = list(/datum/material/plastic=200) + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/medium + name = "Medium Gulp Cup" + desc = "It's a paper cup, but you wouldn't call it 'medium' though. It can hold up to 75 units. It's not very strong." + icon_state = "medium" + volume = 75 + custom_materials = list(/datum/material/plastic=300) + w_class = WEIGHT_CLASS_SMALL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/big + name = "Big Gulp Cup" + desc = "A huge paper cup, a normal person would struggle to drink it all in one sitting. It can hold up to 120 units. It's not very strong." + icon_state = "big" + volume = 120 + custom_materials = list(/datum/material/plastic=500) + w_class = WEIGHT_CLASS_NORMAL + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big + name = "Extra Big Gulp Cup" + desc = "A comically large paper cup. It can hold up to 160 units. It's not very strong." + icon_state = "extra_big" + volume = 160 + custom_materials = list(/datum/material/plastic=600) + w_class = WEIGHT_CLASS_BULKY + +/obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big + name = "Super Extra Big Gulp Cup" + desc = "Its called a paper 'cup', but it looks more like an oversized bucket to you. It can hold up to 250 units. It's not very strong." + icon_state = "super_extra_big" + volume = 250 + custom_materials = list(/datum/material/plastic=1000) + w_class = WEIGHT_CLASS_HUGE diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 227cc2722c..b0d73615b9 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -225,9 +225,3 @@ description = "The gods are pleased with this offering!\n" mood_change = 5 timeout = 3 MINUTES - -//GS13 Port -/datum/mood_event/lewd_headpat - description = "I love headpats so much!\n" - mood_change = 3 - timeout = 2 MINUTES diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 659fccdb1e..6a68334c85 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -464,15 +464,6 @@ GLOBAL_LIST_EMPTY(family_heirlooms) lose_text = "Your mind finally feels calm." medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." -//GS13 Port -//Port from Shadow -/datum/quirk/donotclone - name = "DNC" - desc = "You have filed a Do Not Clone order, stating that you do not wish to be cloned. You can still be revived by other means." - value = -2 - mob_trait = TRAIT_NEVER_CLONE - medical_record_text = "Patient has a DNC (Do not clone) order on file, and cannot be cloned as a result." - /datum/quirk/blindness name = "Blind" desc = "You are completely blind, nothing can counteract this." diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 20caf514ea..064febb2d2 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -189,59 +189,3 @@ /datum/quirk/dullahan/post_add() quirk_holder.AddComponent(/datum/component/dullahan) - -//GS13 Port -/datum/quirk/inheat - name = "In Heat" - desc = "Your system burns with the desire to be bred, your body will betray you and alert others' to your desire when examining you. Satisfying your lust will make you happy, but ignoring it may cause you to become sad and needy." - value = 0 - mob_trait = TRAIT_HEAT - gain_text = "You body burns with the desire to be bred." - lose_text = "You feel more in control of your body and thoughts." - -/datum/quirk/headpat_slut - name = "Headpat Slut" - desc = "You like headpats, alot, maybe even a little bit too much. Headpats give you a bigger mood boost and cause arousal" - mob_trait = TRAIT_HEADPAT_SLUT - value = 0 - medical_record_text = "Patient seems overly affectionate." - -/datum/quirk/headpat_hater - name = "Distant" - desc = "You don't seem to show much care for being touched. Whether it's because you're reserved or due to self control, you won't wag your tail outside of your own control should you possess one." - mob_trait = TRAIT_DISTANT - value = 0 - medical_record_text = "Patient cares little with or dislikes being touched." - -/datum/quirk/universal_diet - name = "Universal diet" - desc = "You are fine with eating just about anything normally edible, you have no strong dislikes in food. Toxic food will still hurt you, though." - value = 0 - gain_text = "You feel like you can eat any food type." - lose_text = "You start to dislike certain food types again." - medical_record_text = "Patient reports no strong dietary dislikes." - -/datum/quirk/universal_diet/add() - var/mob/living/carbon/human/H = quirk_holder - var/datum/species/species = H.dna.species - species.disliked_food = null - -/datum/quirk/universal_diet/remove() - var/mob/living/carbon/human/H = quirk_holder - if(H) - var/datum/species/species = H.dna.species - species.disliked_food = initial(species.disliked_food) - -/datum/quirk/fatness_liker //GS13 - name = "Fat Affinity" - desc = "You like being fat, alot, maybe even a little bit too much. Being fat gives you a bigger mood boost." - mob_trait = TRAIT_FAT_GOOD - value = 0 - medical_record_text = "Patient seems overly content with gaining weight." - -/datum/quirk/fatness_hater //GS13 - name = "Fat Aversion" - desc = "You dislike being fat. Being fat brings your mood down, alot." - mob_trait = TRAIT_FAT_BAD - value = 0 - medical_record_text = "Patient seems distressed by gaining weight." diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 204f7b01a9..0449a09c92 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -131,55 +131,3 @@ reagents.reaction(target, TOUCH) reagents.clear_reagents() return - -//GS 13 - Port -/obj/item/reagent_containers/food/drinks/flask/paper_cup - name = "paper cup" - icon = 'GainStation13/icons/obj/paper_cups.dmi' - amount_per_transfer_from_this = 10 - possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50) - volume = 50 - reagent_flags = OPENCONTAINER - spillable = TRUE - container_HP = 5 - pickup_sound = 'sound/items/handling/cardboardbox_pickup.ogg' - drop_sound = 'sound/items/handling/cardboardbox_drop.ogg' - -/obj/item/reagent_containers/food/drinks/flask/paper_cup/small - name = "Small Gulp Cup" - desc = "A paper cup. It can hold up to 50 units. It's not very strong." - icon_state = "small" - custom_materials = list(/datum/material/plastic=200) - w_class = WEIGHT_CLASS_SMALL - -/obj/item/reagent_containers/food/drinks/flask/paper_cup/medium - name = "Medium Gulp Cup" - desc = "It's a paper cup, but you wouldn't call it 'medium' though. It can hold up to 75 units. It's not very strong." - icon_state = "medium" - volume = 75 - custom_materials = list(/datum/material/plastic=300) - w_class = WEIGHT_CLASS_SMALL - -/obj/item/reagent_containers/food/drinks/flask/paper_cup/big - name = "Big Gulp Cup" - desc = "A huge paper cup, a normal person would struggle to drink it all in one sitting. It can hold up to 120 units. It's not very strong." - icon_state = "big" - volume = 120 - custom_materials = list(/datum/material/plastic=500) - w_class = WEIGHT_CLASS_NORMAL - -/obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big - name = "Extra Big Gulp Cup" - desc = "A comically large paper cup. It can hold up to 160 units. It's not very strong." - icon_state = "extra_big" - volume = 160 - custom_materials = list(/datum/material/plastic=600) - w_class = WEIGHT_CLASS_BULKY - -/obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big - name = "Super Extra Big Gulp Cup" - desc = "Its called a paper 'cup', but it looks more like an oversized bucket to you. It can hold up to 250 units. It's not very strong." - icon_state = "super_extra_big" - volume = 250 - custom_materials = list(/datum/material/plastic=1000) - w_class = WEIGHT_CLASS_HUGE