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

Bugfixes (#4977)

Browse Source 
Branded IPC frames can now wear wizard and mercs voidsuits. Fixes #4950
This commit is contained in:
Mykhailo Bykhovtsev
2018-07-08 11:58:03 -07:00
committed by Werner
parent 0ae388c64f
commit fd95234760
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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")
species_restricted = list("Human", "Vaurca", "Machine", "Heavy Machine")
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")
species_restricted = list("Human", "Skrell", "Vaurca", "Machine", "Heavy Machine")
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", "Skeleton")
species_restricted = list("Human", "Machine", "Heavy Machine", "Skeleton")
/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", "Skeleton")
species_restricted = list("Human", "Skrell", "Machine", "Heavy Machine", "Skeleton")
/obj/item/clothing/suit/space/void/wizard/equipped(var/mob/living/user)
if(!user.is_wizard())