From 852eee166d4adba01330cbc699bbe9c1a6c56991 Mon Sep 17 00:00:00 2001
From: sarcoph <83266791+sarcoph@users.noreply.github.com>
Date: Thu, 5 May 2022 19:42:35 -0800
Subject: [PATCH] consistency's sake
---
code/game/objects/structures.dm | 4 ++--
.../objects/structures/crates_lockers/closets.dm | 2 +-
.../objects/structures/crates_lockers/crates.dm | 2 +-
modular_citadel/code/modules/arousal/arousal.dm | 14 +++++++-------
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index b25e58157..4f404015b 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -3,7 +3,7 @@
pressure_resistance = 8
max_integrity = 300
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
- var/climb_time = 20
+ var/climb_time=20
var/climb_stun = 20
var/climbable = FALSE
var/mob/living/structureclimber
@@ -66,7 +66,7 @@
src.add_fingerprint(user)
user.visible_message("[user] starts climbing onto [src].", \
"You start climbing onto [src]...")
- var/adjusted_climb_time = climb_time
+ var/adjusted_climb_time=climb_time
if(user.restrained()) //climbing takes twice as long when restrained.
adjusted_climb_time *= 2
if(isalien(user))
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 1d960b210..b8627c554 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -243,7 +243,7 @@
return FALSE
take_contents()
playsound(loc, close_sound, 15, 1, -3)
- climb_time = initial(climb_time)
+ climb_time=initial(climb_time)
opened = FALSE
density = TRUE
update_icon()
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 5b16126e0..5e7e7091c 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -10,7 +10,7 @@
allow_dense = TRUE
dense_when_open = TRUE
climbable = TRUE
- climb_time = 10 //real fast, because let's be honest stepping into or onto a crate is easy
+ climb_time=10 //real fast, because let's be honest stepping into or onto a crate is easy
climb_stun = 0 //climbing onto crates isn't hard, guys
delivery_icon = "deliverycrate"
var/obj/item/paper/fluff/jobs/cargo/manifest/manifest
diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index ca9b99bf9..8b8780b46 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -201,7 +201,7 @@
*
* Returns: `TRUE`/`FALSE` - Whether or not the mob passes all of the above checks.
*/
-/mob/living/proc/can_orgasm(arousal = 100)
+/mob/living/proc/can_orgasm(arousal=100)
if(src.canbearoused && src.getArousalLoss() >= arousal && ishuman(src) && src.has_dna())
return TRUE
return FALSE
@@ -232,7 +232,7 @@
* - `cover`: Whether or not the mob is climaxing over themselves.
* - `mb_time`: Warm-up time for this interaction.
*/
-/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/genital, cover = FALSE, mb_time = 30)
+/mob/living/carbon/human/proc/mob_masturbate(obj/item/organ/genital/genital, cover=FALSE, mb_time=3 SECONDS)
var/total_fluids = 0
var/datum/reagents/fluid_source = genital.get_fluid_source()
var/condomed = FALSE
@@ -297,7 +297,7 @@
* - `mb_time`: The warm-up time for this interaction.
* - `spillage`: Whether or not climaxing causes this mob to spill fluids on the floor.
*/
-/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/genital, spillage = TRUE, mb_time = 30)
+/mob/living/carbon/human/proc/mob_climax_outside(obj/item/organ/genital/genital, spillage=TRUE, mb_time=3 SECONDS)
var/total_fluids = 0
var/datum/reagents/fluid_source = genital.get_fluid_source()
var/unable_to_come = FALSE
@@ -475,7 +475,7 @@
* - `partner`: This mob's partner for the interaction.
* - `impreg`: Whether or not this interaction has a chance to impregnate.
*/
-/mob/living/carbon/human/proc/mob_climax_inside_spillage(obj/item/organ/genital/picked_organ, mob/living/carbon/partner, impreg = FALSE)
+/mob/living/carbon/human/proc/mob_climax_inside_spillage(obj/item/organ/genital/picked_organ, mob/living/carbon/partner, impreg=FALSE)
var/obj/item/organ/genital/penis/_penis = picked_organ
if(picked_organ.name != "penis" || _penis.sounding || _penis.condom)
mob_climax_in_partner(picked_organ, partner, spillage=FALSE)
@@ -496,7 +496,7 @@
* - `container`: The container being targeted.
* - `mb_time`: The warm-up time for this interaction.
*/
-/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/genital, obj/item/reagent_containers/container, mb_time = 30)
+/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/genital, obj/item/reagent_containers/container, mb_time=3 SECONDS)
if(!container) //Something weird happened
to_chat(src, "You need a container to do this!")
return
@@ -813,9 +813,9 @@
if(C.exposed_genitals.len || C.is_groin_exposed() || C.is_chest_exposed())
partner = C
if(partner)
- user_human.mob_climax_in_partner(current_genital, partner, mb_time = 0)
+ user_human.mob_climax_in_partner(current_genital, partner, mb_time=0)
continue
- user_human.mob_climax_outside(current_genital, mb_time = 0)
+ user_human.mob_climax_outside(current_genital, mb_time=0)
return