cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 21:40:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds defines for species and bodytypes (#9707)

Browse Source
This commit is contained in:
Cyantime
2020-08-24 13:59:24 +02:00
committed by GitHub
parent 02f436ce3d
commit 1a8940bbd8
148 changed files with 880 additions and 783 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/mirror.dm
+4 -4
View File
@@ -83,10 +83,10 @@
/obj/structure/mirror/raider/attack_hand(var/mob/living/carbon/human/user)
if(istype(get_area(src),/area/antag))
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != "Vox")
if(istype(user) && user.mind && user.mind.special_role == "Raider" && user.species.name != SPECIES_VOX)
var/choice = input("Do you wish to become a true Vox of the Shoal? This is not reversible.") as null|anything in list("No","Yes")
if(choice && choice == "Yes")
var/mob/living/carbon/human/vox/vox = new(get_turf(src),"Vox")
var/mob/living/carbon/human/vox/vox = new(get_turf(src),SPECIES_VOX)
vox.gender = user.gender
raiders.equip(vox)
if(user.mind)
@@ -140,10 +140,10 @@
/obj/structure/mirror/merchant/attack_hand(var/mob/living/carbon/human/user)
if(istype(get_area(src),/area/merchant_station))
if(istype(user) && user.mind && (user.mind.assigned_role == "Merchant" || user.mind.assigned_role == "Merchants Assistant") && user.species.name != "Vox")
if(istype(user) && user.mind && (user.mind.assigned_role == "Merchant" || user.mind.assigned_role == "Merchants Assistant") && user.species.name != SPECIES_VOX)
var/choice = input("Do you wish to become a Vox? This is not reversible.") as null|anything in list("No","Yes")
if(choice == "Yes")
user.set_species("Vox")
user.set_species(SPECIES_VOX)
user.species.before_equip(user)
var/newname = sanitizeSafe(input(user,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN)