shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed DNC

Browse Source 
Fixed Arousal enabled when in prefs disabled
This commit is contained in:
AlManiak
2024-10-24 19:33:18 +02:00
parent bba2ef4de6
commit 30f539cb69
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/computer/cloning.dm
+4 -4
View File
@@ -410,12 +410,12 @@
if(isbrain(mob_occupant))
dna = B.stored_dna
if(!can_scan(dna, mob_occupant, FALSE, has_bank_account))
if(HAS_TRAIT(mob_occupant, TRAIT_NEVER_CLONE))
scantemp = "Subject has an active DNC record on file. Unable to clone."
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
return
if(HAS_TRAIT(mob_occupant, TRAIT_NEVER_CLONE))
scantemp = "<font class='bad'>Subject has an active DNC record on file. Unable to clone.</font>"
playsound(src, 'sound/machines/terminal_alert.ogg', 50, 0)
if(!can_scan(dna, mob_occupant, FALSE, has_bank_account))
return
var/datum/data/record/R = new()
code/modules/client/preferences.dm
+6
View File
@@ -3704,6 +3704,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(character.custom_body_size)
character.resize(character.custom_body_size)
//GS13 Port - Add back arousal
if(NOAROUSAL in pref_species.species_traits)
character.canbearoused = FALSE
else
character.canbearoused = arousable
//speech stuff
if(custom_tongue != "default")
var/new_tongue = GLOB.roundstart_tongues[custom_tongue]
code/modules/mob/living/carbon/carbon_defense.dm
+4 -5
View File
@@ -296,11 +296,10 @@
else if(check_zone(M.zone_selected) == BODY_ZONE_HEAD)
var/datum/species/S
S = dna.species
if(ishuman(src))
var/mob/living/carbon/human/H = src
S = dna.species
if(HAS_TRAIT(src, TRAIT_DISTANT)) //No mood buff since you're not really liking it.
if(HAS_TRAIT(H, TRAIT_DISTANT)) //No mood buff since you're not really liking it.
M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better! They seem annoyed...</span>", \
"<span class='warning'>You give [H] a pat on the head to make [p_them()] feel better! They seem annoyed as they're now glaring towards you...</span>")
H.adjustArousal(-5) //Why are you touching me?
@@ -315,12 +314,12 @@
else if(HAS_TRAIT(H, TRAIT_HEADPAT_SLUT))
M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better! They seem incredibly pleased!</span>", \
"<span class='notice'>You give [H] a pat on the head to make [p_them()] feel better! They seem to like it way too much</span>")
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "lewd_headpat", /datum/mood_event/lewd_headpat)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "lewd_headpat", /datum/mood_event/lewd_headpat)
H.adjustArousal(5) //Headpats are hot af
else
M.visible_message("<span class='notice'>[M] gives [H] a pat on the head to make [p_them()] feel better!</span>", \
"<span class='notice'>You give [H] a pat on the head to make [p_them()] feel better!</span>")
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "headpat", /datum/mood_event/headpat)
SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "headpat", /datum/mood_event/headpat)
friendly_check = TRUE
if(!(HAS_TRAIT(src, TRAIT_DISTANT)))
code/modules/mob/living/carbon/human/species.dm
-7
View File
@@ -546,13 +546,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
SEND_SIGNAL(C, COMSIG_SPECIES_GAIN, src, old_species)
//GS13 Port - Add back arousal
if(NOAROUSAL in species_traits)
C.canbearoused = FALSE
else
if(C.client)
C.canbearoused = C.client?.prefs?.arousable
/datum/species/proc/update_species_slowdown(mob/living/carbon/human/H)
H.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/species, TRUE, multiplicative_slowdown = speedmod)