cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-23 12:47:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/784

Browse Source
This commit is contained in:
BongaTheProto
2024-05-14 19:23:36 -05:00
parent 5d35347b47 839379c08d
commit 68ff25e205
1986 changed files with 300592 additions and 259562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/datums/components/crafting/recipes/recipes_clothing.dm
+3 -3
View File
@@ -1,14 +1,14 @@
/datum/crafting_recipe/tailbag
name = "Tailbag"
result = /obj/item/storage/tailbag
result = /obj/item/storage/wallet/tailbag
reqs = list(/obj/item/stack/sheet/leather = 2)
time = 30
category = CAT_CLOTHING
/datum/crafting_recipe/tailbag_xl
name = "XL Tailbag"
result = /obj/item/storage/tailbag/xtralg
reqs = list(/obj/item/storage/tailbag = 1,
result = /obj/item/storage/wallet/tailbag/xtralg
reqs = list(/obj/item/storage/wallet/tailbag = 1,
/obj/item/stack/sheet/leather = 2)
time = 30
category = CAT_CLOTHING
modular_splurt/code/datums/components/dullahan.dm
+3 -3
View File
@@ -29,7 +29,7 @@
src.color = "#[fire_color]"
lit(color)
RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/unlit)
RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(unlit))
// RegisterSignal(parent, COMSIG_MOB_LIFE)
/datum/component/neckfire/proc/lit(fire_color)
@@ -91,8 +91,8 @@
/datum/component/dullahan/Initialize()
. = ..()
RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, .proc/on_mouse_dropped)
RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, .proc/on_mouse_drop)
RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(on_mouse_dropped))
RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, PROC_REF(on_mouse_drop))
/datum/component/dullahan/proc/add_head_accessory(obj/item/clothing/I, item_path)
head_accessory_MA = mutable_appearance(I.mob_overlay_icon || HEAD_ACCESSORIES_PATHS[item_path])
modular_splurt/code/datums/components/organ_inflation.dm
+3 -3
View File
@@ -32,7 +32,7 @@
inflate_organ(size - old_size)
/datum/component/organ_inflation/RegisterWithParent()
RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/on_entering)
RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(on_entering))
if(container)
register_container()
@@ -42,8 +42,8 @@
unregister_container()
/datum/component/organ_inflation/proc/register_container()
RegisterSignal(container, COMSIG_ORGAN_INSERTED, .proc/on_inserted)
RegisterSignal(container, COMSIG_ORGAN_REMOVED, .proc/on_removed)
RegisterSignal(container, COMSIG_ORGAN_INSERTED, PROC_REF(on_inserted))
RegisterSignal(container, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
/datum/component/organ_inflation/proc/unregister_container()
UnregisterSignal(container, COMSIG_ORGAN_REMOVED)
modular_splurt/code/datums/components/pregnancy.dm
+11 -28
View File
@@ -97,11 +97,11 @@
/datum/component/pregnancy/RegisterWithParent()
if(carrier)
register_carrier()
RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/on_entering)
RegisterSignal(parent, COMSIG_OBJ_BREAK, .proc/on_obj_break)
RegisterSignal(parent, COMSIG_OBJ_WRITTEN_ON, .proc/name_egg)
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/handle_hatch)
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/eg_status)
RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(on_entering))
RegisterSignal(parent, COMSIG_OBJ_BREAK, PROC_REF(on_obj_break))
RegisterSignal(parent, COMSIG_OBJ_WRITTEN_ON, PROC_REF(name_egg))
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_hatch))
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(eg_status))
/datum/component/pregnancy/UnregisterFromParent()
if(carrier)
@@ -113,18 +113,16 @@
UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
/datum/component/pregnancy/proc/register_carrier()
RegisterSignal(carrier, COMSIG_MOB_DEATH, .proc/fetus_mortus)
RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, .proc/handle_life)
RegisterSignal(carrier, COMSIG_HEALTH_SCAN, .proc/on_scan)
RegisterSignal(carrier, COMSIG_MOB_APPLY_DAMAGE, .proc/handle_damage)
RegisterSignal(carrier, COMSIG_MOB_DEATH, PROC_REF(clear_eggs))
RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, PROC_REF(handle_life))
RegisterSignal(carrier, COMSIG_HEALTH_SCAN, PROC_REF(on_scan))
if(oviposition)
RegisterSignal(carrier, COMSIG_MOB_CLIMAX, .proc/on_climax)
RegisterSignal(carrier, COMSIG_MOB_CLIMAX, PROC_REF(on_climax))
/datum/component/pregnancy/proc/unregister_carrier()
UnregisterSignal(carrier, COMSIG_MOB_DEATH)
UnregisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE)
UnregisterSignal(carrier, COMSIG_HEALTH_SCAN)
UnregisterSignal(carrier, COMSIG_MOB_APPLY_DAMAGE)
UnregisterSignal(carrier, COMSIG_MOB_CLIMAX)
/datum/component/pregnancy/Destroy()
@@ -227,7 +225,7 @@
if(stage < max_stage)
return
INVOKE_ASYNC(src, .proc/hatch, source, I, user, params)
INVOKE_ASYNC(src, PROC_REF(hatch), source, I, user, params)
/datum/component/pregnancy/proc/hatch(datum/source, obj/item/I, mob/user, params)
if(!COOLDOWN_FINISHED(src, hatch_request_cooldown))
@@ -403,26 +401,11 @@
/datum/component/pregnancy/proc/human_pragency_end(mob/living/carbon/human/gregnant)
SEND_SIGNAL(gregnant, COMSIG_CLEAR_MOOD_EVENT, "pregnancy")
/datum/component/pregnancy/proc/fetus_mortus()
/datum/component/pregnancy/proc/clear_eggs()
SIGNAL_HANDLER
if(!QDELETED(carrier) && get_turf(carrier) && (stage >= 2))
if(!oviposition)
new /obj/effect/gibspawner/generic(get_turf(carrier))
else
new /obj/effect/decal/cleanable/egg_smudge(get_turf(carrier))
carrier.Knockdown(200, TRUE, TRUE)
carrier.Stun(200, TRUE, TRUE)
carrier.adjustStaminaLoss(200)
qdel(src)
/datum/component/pregnancy/proc/on_scan(datum/source, mob/user)
SIGNAL_HANDLER
to_chat(user, span_notice("<b>Pregnancy detected!</b>"))
//drop kicked
/datum/component/pregnancy/proc/handle_damage(datum/source, damage, damagetype, def_zone)
SIGNAL_HANDLER
if(def_zone == BODY_ZONE_CHEST && damage > 20 && prob(40))
fetus_mortus()
modular_splurt/code/datums/components/pregnancy_inert.dm
+4 -4
View File
@@ -18,14 +18,14 @@
carrier = genital.owner
/datum/component/ovipositor/RegisterWithParent()
RegisterSignal(parent, COMSIG_ORGAN_INSERTED, .proc/on_inserted)
RegisterSignal(parent, COMSIG_ORGAN_REMOVED, .proc/on_removed)
RegisterSignal(parent, COMSIG_ORGAN_INSERTED, PROC_REF(on_inserted))
RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
if(carrier)
register_carrier()
/datum/component/ovipositor/proc/register_carrier()
RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, .proc/handle_life)
RegisterSignal(carrier, COMSIG_MOB_CLIMAX, .proc/on_climax)
RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, PROC_REF(handle_life))
RegisterSignal(carrier, COMSIG_MOB_CLIMAX, PROC_REF(on_climax))
/datum/component/ovipositor/proc/unregister_carrier()
UnregisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE)
modular_splurt/code/datums/components/size_normalized.dm
+1 -1
View File
@@ -22,7 +22,7 @@
wearer.flash_lighting_fx(3, 3, LIGHT_COLOR_PURPLE)
wearer.visible_message(span_warning("A flash of purple light engulfs \the [wearer], before [wearer.p_they()] jump[wearer.p_s()] to a more average size!"),span_notice("You feel warm for a moment, before everything scales to your size..."))
wearer.update_size(normal_resize)
RegisterSignal(wearer, COMSIG_MOB_RESIZED, .proc/normalize_size)
RegisterSignal(wearer, COMSIG_MOB_RESIZED, PROC_REF(normalize_size))
//Denormalize the mob when the component is destroyed (if needed)
/datum/component/size_normalized/UnregisterFromParent()