cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-18 11:30:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into various-misc

Browse Source
This commit is contained in:
DragonTrance
2021-05-01 10:31:15 -07:00
committed by GitHub
parent 31290bbfe6 1d6f0e3dce
commit b9cac11e92
124 changed files with 9704 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hyperstation/code/datums/mood_events/events.dm
+6 -1
View File
@@ -11,4 +11,9 @@
/datum/mood_event/kiss
description = "<span class='nicegreen'>Someone kissed me, I feel happy!</span>\n"
mood_change = 2
timeout = 3 MINUTES
timeout = 3 MINUTES
/datum/mood_event/deathsaw
description = "<span class='boldwarning'>I saw someone die!</span>\n"
mood_change = -8
timeout = 20 MINUTES //takes a long time to get over
hyperstation/code/datums/traits/neutral.dm
+4 -5
View File
@@ -56,10 +56,10 @@
/datum/quirk/virile
name = "Virile"
desc = "Either through higher quality sperms, more of them, or just being more horny, your impregnation chance will increase by 20-30%."
value = 1
value = 0
category = CATEGORY_SEXUAL
medical_record_text = "Patient has a higher sperm count."
//mob_trait = TRAIT_VIRILE
mob_trait = TRAIT_VIRILE
gain_text = "<span class='notice'>You feel more potent."
lose_text = "<span class='notice'>You feel less potent."
var/ichange = 0
@@ -72,13 +72,12 @@
if(quirk_holder)
quirk_holder.impregchance -= ichange
/datum/quirk/macrophile
name = "Macrophile"
desc = "You are attracted to larger people, and being stepped on by them."
value = 0
category = CATEGORY_SEXUAL
//mob_trait = TRAIT_MACROPHILE
mob_trait = TRAIT_MACROPHILE
gain_text = "<span class='notice'>You feel attracted to people larger than you."
lose_text = "<span class='notice'>You feel less attracted to people larger than you."
@@ -87,6 +86,6 @@
desc = "You are attracted to smaller people, and stepping on them."
value = 0
category = CATEGORY_SEXUAL
//mob_trait = TRAIT_MICROPHILE
mob_trait = TRAIT_MICROPHILE
gain_text = "<span class='notice'>You feel attracted to people smaller than you."
lose_text = "<span class='notice'>You feel less attracted to people smaller than you."