cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00: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 07:59:24 -04: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

6
code/modules/projectiles/guns/alien.dm
View File

@@ -48,7 +48,7 @@
/obj/item/gun/launcher/spikethrower/special_check(user)
if(istype(user,/mob/living/carbon/human))
var/mob/living/carbon/human/H = user
if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis")
if(H.species && H.species.name != SPECIES_VOX && H.species.name != SPECIES_VOX_ARMALIS)
to_chat(user, "<span class='warning'>\The [src] does not respond to you!</span>")
return 0
return ..()
@@ -82,14 +82,14 @@
var/mode = 1
sprite_sheets = list(
"Vox Armalis" = 'icons/mob/species/armalis/held.dmi'
BODYTYPE_VOX_ARMALIS = 'icons/mob/species/armalis/held.dmi'
)
/obj/item/gun/energy/noisecannon/attack_hand(mob/user as mob)
if(loc != user)
var/mob/living/carbon/human/H = user
if(istype(H))
if(H.species.name == "Vox Armalis")
if(H.species.name == SPECIES_VOX_ARMALIS)
..()
return
to_chat(user, "<span class='warning'>\The [src] is far too large for you to pick up.</span>")