cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 16:38:22 +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/items.dm
+1 -1
View File
@@ -75,7 +75,7 @@
/* Species-specific sprites, concept stolen from Paradise//vg/.
ex:
sprite_sheets = list(
"Tajara" = 'icons/cat/are/bad'
BODYTYPE_TAJARA = 'icons/cat/are/bad'
)
If index term exists and icon_override is not set, this sprite sheet will be used.
*/
code/game/objects/items/devices/modkit.dm
+2 -2
View File
@@ -7,7 +7,7 @@
desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user."
icon_state = "modkit"
var/parts = MODKIT_FULL
var/target_species = "Human"
var/target_species = BODYTYPE_HUMAN
var/list/permitted_types = list(
/obj/item/clothing/head/helmet/space/void,
@@ -69,4 +69,4 @@
/obj/item/device/modkit/tajaran
name = "tajaran hardsuit modification kit"
desc = "A kit containing all the needed tools and parts to modify a voidsuit for another user. This one looks like it's meant for Tajarans."
target_species = "Tajara"
target_species = BODYTYPE_TAJARA
code/game/objects/items/weapons/storage/backpack.dm
+4 -4
View File
@@ -22,7 +22,7 @@
slot_flags = SLOT_BACK
max_w_class = 3
max_storage_space = 28
var/species_restricted = list("exclude","Vaurca Breeder","Vaurca Warform")
var/species_restricted = list("exclude",BODYTYPE_VAURCA_BREEDER,BODYTYPE_VAURCA_WARFORM)
drop_sound = 'sound/items/drop/backpack.ogg'
pickup_sound = 'sound/items/pickup/backpack.ogg'
allow_quick_empty = TRUE
@@ -175,7 +175,7 @@
desc = "It's a Vaurca cloak, with paltry storage options."
icon_state = "cape"
max_storage_space = 12
sprite_sheets = list("Vaurca" = 'icons/mob/species/vaurca/back.dmi')
sprite_sheets = list(BODYTYPE_VAURCA = 'icons/mob/species/vaurca/back.dmi')
/obj/item/storage/backpack/syndie
name = "syndicate rucksack"
@@ -511,5 +511,5 @@
slot_flags = SLOT_BACK
max_storage_space = 12
canremove = 0
species_restricted = list("Vaurca Breeder")
sprite_sheets = list("Vaurca Breeder" = 'icons/mob/species/breeder/back.dmi')
species_restricted = list(BODYTYPE_VAURCA_BREEDER)
sprite_sheets = list(BODYTYPE_VAURCA_BREEDER = 'icons/mob/species/breeder/back.dmi')
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -353,7 +353,7 @@
if(!(S.status & ORGAN_ASSISTED) || user.a_intent != I_HELP)
return ..()
if(H.isSynthetic() && H == user && !(H.get_species() == "Military Frame"))
if(H.isSynthetic() && H == user && !(H.get_species() == SPECIES_IPC_TERMINATOR))
to_chat(user, SPAN_WARNING("You can't repair damage to your own body - it's against OH&S."))
return
code/game/objects/items/weapons/vaurca_items.dm
+10 -10
View File
@@ -17,7 +17,7 @@
desc = "A basic screw on filter attached beneath the mouthparts of the common Vaurca."
name = "filter port"
icon_state = "filterport"
species_restricted = list("Vaurca", "Vaurca Breeder")
species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BREEDER)
item_state = 0
/obj/item/clothing/head/shaper
@@ -27,7 +27,7 @@
icon_state = "shaper_helmet"
item_state = "shaper_helmet"
contained_sprite = TRUE
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
body_parts_covered = HEAD|FACE|EYES
/obj/item/clothing/head/expression
@@ -223,7 +223,7 @@
desc = "A lightweight Zo'rane designed Vaurcae softsuit, for extremely extended EVA operations."
slowdown = 0
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
boots = /obj/item/clothing/shoes/magboots/vox/vaurca
helmet = /obj/item/clothing/head/helmet/space/void/vaurca
@@ -236,7 +236,7 @@
icon_state = "helm_void"
item_state = "helm_void"
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
light_overlay = "helmet_light_dual_green"
light_color = "#3e7c3e"
@@ -250,9 +250,9 @@
contained_sprite = 1
icon = 'icons/obj/vaurca_items.dmi'
species_restricted = list("Vaurca","Vaurca Warform")
species_restricted = list(BODYTYPE_VAURCA,BODYTYPE_VAURCA_WARFORM)
sprite_sheets = list(
"Vaurca Warform" = 'icons/mob/species/warriorform/shoes.dmi'
BODYTYPE_VAURCA_WARFORM = 'icons/mob/species/warriorform/shoes.dmi'
)
action_button_name = "Toggle the magclaws"
@@ -266,7 +266,7 @@
desc = "Armor designed for K'laxan scouts, made of lightweight sturdy material that does not restrict movement."
slowdown = -1
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
armor = list(melee = 50, bullet = 20, laser = 50, energy = 30, bomb = 45, bio = 100, rad = 10)
/obj/item/clothing/head/helmet/space/void/scout
@@ -277,7 +277,7 @@
icon_state = "helm_scout"
item_state = "helm_scout"
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
armor = list(melee = 40, bullet = 20, laser = 40, energy = 30, bomb = 45, bio = 100, rad = 10)
light_overlay = "helmet_light_dual_green"
@@ -291,7 +291,7 @@
item_state = "commando"
desc = "A design perfected by the Zo'ra, this helmet is commonly used by frontline warriors of a hive. Ablative design deflects lasers away from the body while providing moderate physical protection."
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
armor = list(melee = 40, bullet = 40, laser = 60, energy = 50, bomb = 45, bio = 100, rad = 10)
/obj/item/clothing/head/helmet/space/void/commando
@@ -302,7 +302,7 @@
icon_state = "helm_commando"
item_state = "helm_commando"
species_restricted = list("Vaurca")
species_restricted = list(BODYTYPE_VAURCA)
armor = list(melee = 30, bullet = 30, laser = 60, energy = 50, bomb = 45, bio = 100, rad = 10)
light_overlay = "helmet_light_dual_green"
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)