Fixed genitals not producing reagents

This commit is contained in:
AlManiak
2024-10-14 13:58:41 +02:00
parent 854a0cf4b4
commit f7181a0aa8
5 changed files with 11 additions and 5 deletions
+1 -1
View File
@@ -348,7 +348,7 @@
if(!G.linked_organ)
to_chat(src, "<span class='warning'>Your [G.name] is unable to produce it's own fluids, it's missing the organs for it.</span>")
return
fluid_source = G.linked_organ.reagents
fluid_source = G.linked_organ.reagents
total_fluids = fluid_source.total_volume
if(mb_time && !remote) //Skip warning if this is an instant climax.
+7 -1
View File
@@ -45,8 +45,14 @@
linked_organ = null
. = ..()
//GS13 Port - Make gentials actually produce "reagents"
/obj/item/organ/genital/on_life()
return
if(QDELETED(src))
return
if(!reagents || !owner)
return
generate_fluid(reagents)
/obj/item/organ/genital/proc/set_aroused_state(new_state,cause = "manual toggle")
if(!(genital_flags & GENITAL_CAN_AROUSE))
-1
View File
@@ -12,7 +12,6 @@
genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_CAN_AROUSE|UPDATE_OWNER_APPEARANCE|GENITAL_UNDIES_HIDDEN|GENITAL_CAN_TAUR
linked_organ_slot = ORGAN_SLOT_TESTICLES
fluid_transfer_factor = 0.5
producing = TRUE
shape = DEF_COCK_SHAPE
size = 2 //arbitrary value derived from length and diameter for sprites.
layer_index = PENIS_LAYER_INDEX
+1
View File
@@ -13,6 +13,7 @@
var/size_name = "average"
shape = DEF_BALLS_SHAPE
fluid_id = /datum/reagent/consumable/semen
producing = TRUE
masturbation_verb = "massage"
can_climax = TRUE
layer_index = TESTICLES_LAYER_INDEX
+2 -2
View File
@@ -4057,6 +4057,7 @@
#include "hyperstation\code\game\objects\railings.dm"
#include "hyperstation\code\game\objects\structures\bench.dm"
#include "hyperstation\code\game\objects\structures\sauna_oven.dm"
#include "hyperstation\code\modules\arousal\arousalhud.dm"
#include "hyperstation\code\modules\clothing\sizeaccessories.dm"
#include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm"
#include "hyperstation\code\modules\mob\living\status_indicators.dm"
@@ -4067,11 +4068,10 @@
#include "hyperstation\code\modules\resize\sizechems.dm"
#include "hyperstation\code\modules\resize\sizegun.dm"
#include "hyperstation\code\modules\surgery\organs\augments_arms.dm"
#include "hyperstation\code\modules\arousal\arousalhud.dm"
#include "hyperstation\code\obj\ashtray.dm"
#include "hyperstation\code\obj\decal.dm"
#include "hyperstation\code\obj\kinkyclothes.dm"
#include "hyperstation\code\obj\fleshlight.dm"
#include "hyperstation\code\obj\kinkyclothes.dm"
#include "hyperstation\code\obj\sizeitems.dm"
#include "hyperstation\code\obj\stargate_clothing.dm"
#include "hyperstation\code\obj\ZaoCorp\hat.dm"