shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review commentary resolution

Browse Source
This commit is contained in:
AlManiak
2024-10-28 17:53:36 +01:00
parent e86c52cb2b
commit ef93595938
6 changed files with 49 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/datums/traits.dm
-19
View File
@@ -126,25 +126,6 @@
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 = "<span class='notice'>You feel like you can eat any food type.</span>"
lose_text = "<span class='notice'>You start to dislike certain food types again.</span>"
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."
GainStation13/code/modules/research/designs/autolathe.dm
+40
View File
@@ -5,3 +5,43 @@
materials = list(/datum/material/iron = 1000, /datum/material/glass = 500)
build_path = /obj/item/assembly/infra/fat
category = list("initial", "Misc")
/datum/design/small_cup
name = "Small Gulp Cup"
id = "Small_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=200)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small
category = list("initial","Dinnerware")
/datum/design/medium_cup
name = "Medium Gulp Cup"
id = "Medium_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=300)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
category = list("initial","Dinnerware")
/datum/design/small_cup
name = "Big Gulp Cup"
id = "Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=500)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big
category = list("initial","Dinnerware")
/datum/design/extra_big_cup
name = "Extra Big Gulp Cup"
id = "Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=600)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
category = list("initial","Dinnerware")
/datum/design/super_extra_big_cup
name = "Super Extra Big Gulp Cup"
id = "Super_Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=1000)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
category = list("initial","Dinnerware")
code/datums/looping_sounds/machinery_sounds.dm
+7
View File
@@ -65,6 +65,13 @@
volume = 50
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/*
/datum/looping_sound/deep_fryer
mid_length = 2
mid_sounds = list('sound/machines/fryer/deep_fryer_1.ogg' = 1, 'sound/machines/fryer/deep_fryer_2.ogg' = 1)
volume = 30
*/
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/datum/looping_sound/microwave
start_sound = 'sound/machines/microwave/microwave-start.ogg'
code/game/machinery/computer/cloning.dm
+1
View File
@@ -410,6 +410,7 @@
if(isbrain(mob_occupant))
dna = B.stored_dna
//GS13 Port - DNC
if(HAS_TRAIT(mob_occupant, TRAIT_NEVER_CLONE))
scantemp = "Subject has an active DNC record on file. Unable to clone."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
code/modules/mob/living/carbon/carbon_defense.dm
+1
View File
@@ -299,6 +299,7 @@
S = dna.species
if(ishuman(src))
var/mob/living/carbon/human/H = src
//GS13 Port - Headpat slut stuff
if(HAS_TRAIT(H, TRAIT_DISTANT)) //No mood buff since you're not really liking it.
M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better! They seem annoyed...</span>", \
"<span class='warning'>You give [H] a pat on the head to make [p_them()] feel better! They seem annoyed as they're now glaring towards you...</span>")
code/modules/research/designs/autolathe_desings/autolathe_designs_medical_and_dinnerware.dm
-41
View File
@@ -77,47 +77,6 @@
build_path = /obj/item/reagent_containers/food/drinks/shaker
category = list("initial","Dinnerware")
//GS13 Port - Add gulp cups
/datum/design/small_cup
name = "Small Gulp Cup"
id = "Small_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=200)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/small
category = list("initial","Dinnerware")
/datum/design/medium_cup
name = "Medium Gulp Cup"
id = "Medium_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=300)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/medium
category = list("initial","Dinnerware")
/datum/design/small_cup
name = "Big Gulp Cup"
id = "Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=500)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/big
category = list("initial","Dinnerware")
/datum/design/extra_big_cup
name = "Extra Big Gulp Cup"
id = "Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=600)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/extra_big
category = list("initial","Dinnerware")
/datum/design/super_extra_big_cup
name = "Super Extra Big Gulp Cup"
id = "Super_Extra_Big_Gulp"
build_type = AUTOLATHE
materials = list(/datum/material/plastic=1000)
build_path = /obj/item/reagent_containers/food/drinks/flask/paper_cup/super_extra_big
category = list("initial","Dinnerware")
////////////
///Medical//
////////////