cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 11:30:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds ipc voidsuit sprites (#5419)

Browse Source 
Baseline frames can no longer wear regular voidsuits, they now must circle them inside a suit cycler. Also, adds ipc voidsuits and hardsuit sprites too.

Sprites were made by kyres.
This commit is contained in:
Alberyk
2018-10-26 19:51:24 -03:00
committed by Werner
parent ac8f0eccca
commit 343c0da8dc
11 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
+1 -2
View File
@@ -84,11 +84,10 @@
//Set species_restricted list
switch(target_species)
if("Human", "Skrell", "Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") //humanoid bodytypes
if("Human", "Skrell", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame") //humanoid bodytypes
species_restricted = list(
"Human",
"Skrell",
"Machine",
"Zeng-Hu Mobility Frame",
"Bishop Accessory Frame"
) //skrell/humans like to share with IPCs
code/modules/clothing/spacesuits/rig/rig_pieces.dm
+3 -2
View File
@@ -14,7 +14,8 @@
sprite_sheets = list(
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Unathi" = 'icons/mob/species/unathi/helmet.dmi'
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Machine" = 'icons/mob/species/machine/helmet.dmi'
)
species_restricted = list("exclude","Diona","Xenomorph","Vaurca","Golem", "Vox")
@@ -50,7 +51,7 @@
breach_threshold = 38
resilience = 0.2
can_breach = 1
sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi')
sprite_sheets = list("Tajara" = 'icons/mob/species/tajaran/suit.dmi',"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Machine = 'icons/mob/species/machine/suit.dmi")
species_restricted = list("exclude","Diona","Xenomorph","Golem","Vaurca","Vox")
supporting_limbs = list()
code/modules/clothing/spacesuits/void/merc.dm
+2 -2
View File
@@ -10,7 +10,7 @@
)
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
species_restricted = list("Human", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list("Human", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
camera_networks = list(NETWORK_MERCENARY)
light_overlay = "helmet_light_green" //todo: species-specific light overlays
brightness_on = 6
@@ -30,4 +30,4 @@
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
siemens_coefficient = 0.3
species_restricted = list("Human", "Skrell", "Vaurca", "Machine", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list("Human", "Skrell", "Heavy Machine", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
code/modules/clothing/spacesuits/void/void.dm
+10 -6
View File
@@ -10,18 +10,20 @@
siemens_coefficient = 0.4
//Species-specific stuff.
species_restricted = list("Human", "Machine", "Bishop Accessory Frame")
species_restricted = list("Human", "Bishop Accessory Frame")
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
"Skrell" = 'icons/mob/species/skrell/helmet.dmi',
"Vaurca" = 'icons/mob/species/vaurca/helmet.dmi'
"Vaurca" = 'icons/mob/species/vaurca/helmet.dmi',
"Machine" = 'icons/mob/species/machine/helmet.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi',
"Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi'
"Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi',
"Machine" = 'icons/obj/clothing/species/machine/hats.dmi'
)
light_overlay = "helmet_light"
@@ -38,18 +40,20 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.4
species_restricted = list("Human", "Skrell", "Machine", "Bishop Accessory Frame")
species_restricted = list("Human", "Skrell", "Bishop Accessory Frame")
sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajara" = 'icons/mob/species/tajaran/suit.dmi',
"Skrell" = 'icons/mob/species/skrell/suit.dmi',
"Vaurca" = 'icons/mob/species/vaurca/suit.dmi'
"Vaurca" = 'icons/mob/species/vaurca/suit.dmi',
"Machine" = 'icons/mob/species/machine/suit.dmi'
)
sprite_sheets_obj = list(
"Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi',
"Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi',
"Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi',
"Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi'
"Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi',
"Machine" = 'icons/obj/clothing/species/machine/suits.dmi'
)
//Breach thresholds, should ideally be inherited by most (if not all) voidsuits.
code/modules/clothing/spacesuits/void/wizard.dm
+2 -2
View File
@@ -11,7 +11,7 @@
armor = list(melee = 40, bullet = 20, laser = 20,energy = 20, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.3
wizard_garb = 1
species_restricted = list("Human", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list("Human", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
/obj/item/clothing/head/helmet/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())
@@ -47,7 +47,7 @@
siemens_coefficient = 0.3
wizard_garb = 1
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/teleportation_scroll,/obj/item/weapon/scrying,/obj/item/weapon/spellbook,/obj/item/device/soulstone,/obj/item/weapon/material/knife/ritual)
species_restricted = list("Human", "Skrell", "Machine", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
species_restricted = list("Human", "Skrell", "Heavy Machine", "Skeleton", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame")
/obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())