cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 23:51:17 +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/modules/spell_system/artifacts/armor/bone_armor.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "bonearmor"
item_state = "bonearmor"
contained_sprite = 1
species_restricted = list("Skeleton")
species_restricted = list(BODYTYPE_SKELETON)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(melee = 50, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0)
@@ -16,5 +16,5 @@
icon_state = "skull"
item_state = "skull"
contained_sprite = 1
species_restricted = list("Skeleton")
species_restricted = list(BODYTYPE_SKELETON)
armor = list(melee = 50, bullet = 40, laser = 50, energy = 25, bomb = 30, bio = 0, rad = 0)
code/modules/spell_system/artifacts/armor/wizard_voidsuit.dm
+2 -2
View File
@@ -10,7 +10,7 @@
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.35
wizard_garb = 1
species_restricted = list("Human", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_SKELETON, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
/obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())
@@ -45,7 +45,7 @@
siemens_coefficient = 0.35
wizard_garb = 1
allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/teleportation_scroll,/obj/item/scrying,/obj/item/spellbook,/obj/item/device/soulstone,/obj/item/material/knife/ritual)
species_restricted = list("Human", "Skrell", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_SKELETON, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP)
/obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())
code/modules/spell_system/spells/spell_list/self/generic/lichdom.dm
+1 -1
View File
@@ -24,7 +24,7 @@
user.visible_message("<span class='cult'>\The [user]'s skin sloughs off bone, their blood boils and guts turn to dust!</span>")
gibs(user.loc)
user.add_spell(new /spell/targeted/dark_resurrection)
user.set_species("Skeleton")
user.set_species(SPECIES_SKELETON)
user.unEquip(user.wear_suit)
user.unEquip(user.head)
user.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/black(user), slot_wear_suit)