cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-07-16 18:22:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

consistency's sake

Browse Source
This commit is contained in:
sarcoph
2022-05-05 19:42:35 -08:00
parent d09d138aa6
commit 852eee166d
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures.dm
+2 -2
View File
@@ -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("<span class='warning'>[user] starts climbing onto [src].</span>", \
"<span class='notice'>You start climbing onto [src]...</span>")
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))
code/game/objects/structures/crates_lockers/closets.dm
+1 -1
View File
@@ -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()
code/game/objects/structures/crates_lockers/crates.dm
+1 -1
View File
@@ -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
modular_citadel/code/modules/arousal/arousal.dm
+7 -7
View File
@@ -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, "<span class='warning'>You need a container to do this!</span>")
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