cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits.

Browse Source
This commit is contained in:
Zuhayr
2015-08-23 01:24:49 +09:30
parent 8564db4643
commit ca4b56cc77
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/clothing/clothing.dm
View File

@@ -50,7 +50,7 @@
//Set species_restricted list //Set species_restricted list
switch(target_species) switch(target_species)
if("Human", "Skrell") //humanoid bodytypes if("Human", "Skrell") //humanoid bodytypes
species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph")
else else
species_restricted = list(target_species) species_restricted = list(target_species)
@@ -72,9 +72,9 @@
//Set species_restricted list //Set species_restricted list
switch(target_species) switch(target_species)
if("Skrell") if("Skrell")
species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph")
if("Human") if("Human")
species_restricted = list("exclude","Skrell","Unathi","Tajara","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Skrell","Unathi","Tajara","Diona","Vox", "Xenomorph")
else else
species_restricted = list(target_species) species_restricted = list(target_species)

4
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -15,7 +15,7 @@
cold_protection = HEAD cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9 siemens_coefficient = 0.9
species_restricted = list("exclude","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Diona", "Xenomorph")
var/obj/machinery/camera/camera var/obj/machinery/camera/camera
var/list/camera_networks var/list/camera_networks
@@ -61,7 +61,7 @@
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.9 siemens_coefficient = 0.9
species_restricted = list("exclude","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Diona", "Xenomorph")
var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit. var/list/supporting_limbs //If not-null, automatically splints breaks. Checked when removing the suit.

4
code/modules/clothing/spacesuits/void/merc.dm
View File

@@ -6,7 +6,7 @@
item_state = "syndie_helm" item_state = "syndie_helm"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.6 siemens_coefficient = 0.6
species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph")
camera_networks = list("NUKE") camera_networks = list("NUKE")
light_overlay = "helmet_light_green" //todo: species-specific light overlays light_overlay = "helmet_light_green" //todo: species-specific light overlays
@@ -20,4 +20,4 @@
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60) 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) 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.6 siemens_coefficient = 0.6
species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph")

4
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -10,7 +10,7 @@
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
//Species-specific stuff. //Species-specific stuff.
species_restricted = list("exclude","Unathi","Tajara","Skrell","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Skrell","Diona","Vox", "Xenomorph")
sprite_sheets_refit = list( sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/helmet.dmi', "Unathi" = 'icons/mob/species/unathi/helmet.dmi',
"Tajara" = 'icons/mob/species/tajaran/helmet.dmi', "Tajara" = 'icons/mob/species/tajaran/helmet.dmi',
@@ -35,7 +35,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph", "Xenomorph Drone", "Xenomorph Hunter", "Xenomorph Sentinel", "Xenomorph Queen") species_restricted = list("exclude","Unathi","Tajara","Diona","Vox", "Xenomorph")
sprite_sheets_refit = list( sprite_sheets_refit = list(
"Unathi" = 'icons/mob/species/unathi/suit.dmi', "Unathi" = 'icons/mob/species/unathi/suit.dmi',
"Tajara" = 'icons/mob/species/tajaran/suit.dmi', "Tajara" = 'icons/mob/species/tajaran/suit.dmi',