cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 15:39:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tapping Gender Fix (#9836)

Browse Source
This commit is contained in:
Snakebittenn
2020-08-31 11:46:07 +02:00
committed by GitHub
parent aa8ca06c1b
commit 397a8d2aff
2 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species.dm
+4 -17
View File
@@ -364,28 +364,15 @@
I.status |= ORGAN_ADV_ROBOT
/datum/species/proc/tap(var/mob/living/carbon/human/H,var/mob/living/target)
var/t_his = "their"
switch(target.gender)
if(MALE)
t_his = "his"
if(FEMALE)
t_his = "her"
var/t_him = "them"
switch(target.gender)
if(MALE)
t_him = "him"
if(FEMALE)
t_him = "her"
if(H.on_fire)
target.fire_stacks += 1
target.IgniteMob()
H.visible_message("<span class='danger'>[H] taps [target], setting [t_him] ablaze!</span>", \
"<span class='warning'>You tap [target], setting [t_him] ablaze!</span>")
H.visible_message("<span class='danger'>[H] taps [target], setting [target.get_pronoun("his")] ablaze!</span>", \
"<span class='warning'>You tap [target], setting [target.get_pronoun("him")] ablaze!</span>")
msg_admin_attack("[key_name(H)] spread fire to [target.name] ([target.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[H.x];Y=[H.y];Z=[H.z]'>JMP</a>)",ckey=key_name(H),ckey_target=key_name(target))
else
H.visible_message("<span class='notice'>[H] taps [target] to get [t_his] attention!</span>", \
"<span class='notice'>You tap [target] to get [t_his] attention!</span>")
H.visible_message("<span class='notice'>[H] taps [target] to get [target.get_pronoun("his")] attention!</span>", \
"<span class='notice'>You tap [target] to get [target.get_pronoun("his")] attention!</span>")
/datum/species/proc/remove_inherent_verbs(var/mob/living/carbon/human/H)
if(inherent_verbs)
html/changelogs/snakebittenn-androgynous.yml
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Snakebittenn
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Tapping someone no longer metagames their gender."