Merge branch 'evilew:master' into feature/bluespace_collar

This commit is contained in:
AlManiak
2025-02-01 00:46:12 +01:00
committed by GitHub
9 changed files with 207 additions and 3 deletions
@@ -13,6 +13,8 @@
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
var/nutrition_amount = 50 // GS13
var/message = "<span class='notice'>You feel less hungry...</span>" // GS13
slot = ORGAN_SLOT_STOMACH_AID
/obj/item/organ/cyberimp/chest/nutriment/on_life()
@@ -26,9 +28,9 @@
if(owner.nutrition <= hunger_threshold)
synthesizing = TRUE
to_chat(owner, "<span class='notice'>You feel less hungry...</span>")
owner.adjust_nutrition(50)
addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50)
to_chat(owner, message)
owner.nutrition += nutrition_amount
addtimer(CALLBACK(src,PROC_REF(synth_cool)), 50)
/obj/item/organ/cyberimp/chest/nutriment/proc/synth_cool()
synthesizing = FALSE
+3
View File
@@ -28,6 +28,9 @@
/obj/item/clothing/under/misc/poly_bottomless = 3,
/obj/item/clothing/under/misc/poly_tanktop = 3,
/obj/item/clothing/under/misc/poly_tanktop/female = 3,
/obj/item/clothing/under/latexfull = 10, //GS13 - ported over latex clothing options
/obj/item/clothing/under/latexhalf = 10, //GS13 - ported over latex clothing options
/obj/item/clothing/gloves/latexsleeves = 10, //GS13 - ported over latex clothing options
/obj/item/autosurgeon/penis = 3,
/obj/item/autosurgeon/testicles = 3,
/obj/item/storage/pill_bottle/penis_enlargement = 10,