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 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

keyword argument funnies, whoops comma

Browse Source
This commit is contained in:
Putnam
2021-02-18 21:55:28 -08:00
parent 990df7df37
commit 257cd6bb34
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/mob/living/carbon/human/species.dm
View File

@@ -1549,7 +1549,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP) user.do_attack_animation(target, ATTACK_EFFECT_ASS_SLAP)
target.adjust_arousal(20,"masochism", maso = TRUE) target.adjust_arousal(20,"masochism", maso = TRUE)
if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10)) if (ishuman(target) && HAS_TRAIT(target, TRAIT_MASO) && target.has_dna() && prob(10))
target.mob_climax(forced_climax=TRUE, "masochism") target.mob_climax(forced_climax=TRUE, cause = "masochism")
if (!HAS_TRAIT(target, TRAIT_PERMABONER)) if (!HAS_TRAIT(target, TRAIT_PERMABONER))
stop_wagging_tail(target) stop_wagging_tail(target)
playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1) playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
@@ -1931,7 +1931,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(BP.receive_damage(damage_amount, 0, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness)) if(BP.receive_damage(damage_amount, 0, wound_bonus = wound_bonus, bare_wound_bonus = bare_wound_bonus, sharpness = sharpness))
H.update_damage_overlays() H.update_damage_overlays()
if(HAS_TRAIT(H, TRAIT_MASO) && prob(damage_amount)) if(HAS_TRAIT(H, TRAIT_MASO) && prob(damage_amount))
H.mob_climax(forced_climax=TRUE, "masochism") H.mob_climax(forced_climax=TRUE, cause = "masochism")
else//no bodypart, we deal damage with a more general method. else//no bodypart, we deal damage with a more general method.
H.adjustBruteLoss(damage_amount) H.adjustBruteLoss(damage_amount)

2
code/modules/vending/kinkmate.dm
View File

@@ -32,7 +32,7 @@
/obj/item/storage/pill_bottle/penis_enlargement = 5, /obj/item/storage/pill_bottle/penis_enlargement = 5,
/obj/item/storage/pill_bottle/breast_enlargement = 5, /obj/item/storage/pill_bottle/breast_enlargement = 5,
/obj/item/reagent_containers/glass/bottle/crocin = 5, /obj/item/reagent_containers/glass/bottle/crocin = 5,
/obj/item/reagent_containers/glass/bottle/camphor = 5 /obj/item/reagent_containers/glass/bottle/camphor = 5,
/obj/item/storage/daki = 4 /obj/item/storage/daki = 4
) )
contraband = list( contraband = list(

2
modular_citadel/code/datums/status_effects/chems.dm
View File

@@ -510,7 +510,7 @@
else if (lewd && lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa else if (lewd && lowertext(customTriggers[trigger]) == "cum")//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
if(ishuman(C)) if(ishuman(C))
var/mob/living/carbon/human/H = C var/mob/living/carbon/human/H = C
H.mob_climax(forced_climax=TRUE, "MKUltra") H.mob_climax(forced_climax=TRUE, cause = "MKUltra")
C.SetStun(10)//We got your stun effects in somewhere, Kev. C.SetStun(10)//We got your stun effects in somewhere, Kev.
//kneel (knockdown) //kneel (knockdown)