cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 14:31:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

More Bugfixes (#4676)

Browse Source 
Changed name of Chemistry request console. Fixed #4670 Fixed #4678
Deleted duplicate windoor in the brig. Fixed #4419
Added one more GPS and emergency medical radio link to EMT room. Fixed #4380
Replaced area of Mainlevel Cryostorage from primary hallway to cryostorage. Fixed #4290
Increased size of Toxin's airlock, adding ability to refill canister from main oxygen supply by using air distro that is used in Mining and Xenoarcheology airlocks. Fixed #4145
Changed c_tags for cameras in Medical construction level. Fixed #4677
Merged two definitions of glasses into one.
Renamed few Request consoles in security construction level according to their room names. Fixed #4687
Fixed turrets without control panel not updating their lethal sprite in lethal mode.
This commit is contained in:
Mykhailo Bykhovtsev
2018-05-07 22:31:11 +03:00
committed by Erki
parent a9e0afefd7
commit 9571507b36
7 changed files with 195 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/clothing.dm
-31
View File
@@ -316,37 +316,6 @@
item_state = "earmuffs"
slot_flags = SLOT_EARS | SLOT_TWOEARS
///////////////////////////////////////////////////////////////////////
//Glasses
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
SEE_OBJS // can see all objs, no matter what
SEE_TURFS // can see all turfs (and areas), no matter what
SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
// in a lit area (via pixel_x,y or smooth movement), can see those pixels
BLIND // can't see anything
*/
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
w_class = 2.0
body_parts_covered = EYES
slot_flags = SLOT_EYES
var/vision_flags = 0
var/darkness_view = 0//Base human is 2
var/see_invisible = -1
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Resomi" = 'icons/mob/species/resomi/eyes.dmi'
)
species_restricted = list("exclude","Vaurca Breeder")
/obj/item/clothing/glasses/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc
M.update_inv_glasses()
///////////////////////////////////////////////////////////////////////
//Gloves
/obj/item/clothing/gloves
code/modules/clothing/glasses/glasses.dm
+28 -5
View File
@@ -1,12 +1,24 @@
///////////////////////////////////////////////////////////////////////
//Glasses
/*
SEE_SELF // can see self, no matter what
SEE_MOBS // can see all mobs, no matter what
SEE_OBJS // can see all objs, no matter what
SEE_TURFS // can see all turfs (and areas), no matter what
SEE_PIXELS// if an object is located on an unlit area, but some of its pixels are
// in a lit area (via pixel_x,y or smooth movement), can see those pixels
BLIND // can't see anything
*/
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
//w_class = 2.0
//slot_flags = SLOT_EYES
//var/vision_flags = 0
//var/darkness_view = 0//Base human is 2
w_class = 2.0
slot_flags = SLOT_EYES
body_parts_covered = EYES
var/vision_flags = 0
var/darkness_view = 0//Base human is 2
var/prescription = 0
var/see_invisible = -1
var/toggleable = 0
var/off_state = "degoggles"
var/active = 1
@@ -14,6 +26,17 @@
var/obj/screen/overlay = null
var/obj/item/clothing/glasses/hud/hud = null // Hud glasses, if any
var/activated_color = null
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/eyes.dmi',
"Resomi" = 'icons/mob/species/resomi/eyes.dmi'
)
species_restricted = list("exclude","Vaurca Breeder")
/obj/item/clothing/glasses/update_clothing_icon()
if (ismob(src.loc))
var/mob/M = src.loc
M.update_inv_glasses()
/obj/item/clothing/glasses/attack_self(mob/user)
if(toggleable)