cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flag fixing, unstaging some files.

Browse Source
This commit is contained in:
ComicIronic
2015-01-11 15:54:11 +00:00
parent 0b982125cf
commit 54f206f23b
11 changed files with 41 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
View File

@@ -99,7 +99,7 @@
/obj/machinery/shield_gen/attack_ghost(mob/user)
if(isAdminGhost(user)) src.attack_hand(user)
return
/obj/machinery/shield_gen/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon))

2
code/ZAS/Plasma.dm
View File

@@ -65,7 +65,7 @@ var/image/contamination_overlay = image('icons/effects/contamination.dmi')
//Burn eyes if exposed.
if(zas_settings.Get(/datum/ZAS_Setting/EYE_BURNS))
var/eye_protection = get_body_part_coverage(EYES)
if(eye_protection != glasses) //goggles aren't enough
if(!eye_protection)
burn_eyes()
//Genetic Corruption

4
code/game/dna/genes/vg_disabilities.dm
View File

@@ -36,8 +36,8 @@
OnSay(var/mob/M, var/message)
M.whisper(message)
/datum/dna/gene/disability/dizzy
name = "Dizzy"
desc = "Causes the cerebellum to shut down in some places."

48
code/game/objects/items/weapons/surgery_tools.dm
View File

@@ -44,16 +44,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
@@ -191,16 +191,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
@@ -322,16 +322,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
@@ -463,16 +463,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
@@ -572,16 +572,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
@@ -730,16 +730,16 @@ LOOK FOR SURGERY.DM*/
var/mob/living/carbon/human/H = M
if(istype(H) && ( \
(H.head && H.head.flags & PL_HCE) || \
(H.wear_mask && H.wear_mask.flags & PL_HCE) || \
(H.glasses && H.glasses.flags & PL_HCE) \
(H.head && H.head.flags & HEADCOVERSEYES) || \
(H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || \
(H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return
var/mob/living/carbon/monkey/Mo = M
if(istype(Mo) && ( \
(Mo.wear_mask && Mo.wear_mask.flags & PL_HCE) \
(Mo.wear_mask && Mo.wear_mask.flags & MASKCOVERSEYES) \
))
user << "\red You're going to need to remove that mask/helmet/glasses first."
return

4
code/libs/Get Flat Icon/Get Flat Icon.dm
View File

@@ -1,9 +1,9 @@
/* *********************************************************************
_____ _ ______ _ _ _____
/ ____| | | ____| | | |_ _|
/ ____| | | | ____| | | | |_ _|
| | __ ___| |_ | |__ | | __ _| |_ | | ___ ___ _ __
| | |_ |/ _ \ __| | __| | |/ _` | __| | / __/ _ \| '_ \
| | |_ |/ _ \ __| | __| | |/ _` | __| | | / __/ _ \| '_ \
| |__| | __/ |_ | | | | (_| | |_ _| || (_| (_) | | | |
\_____|\___|\__| |_| |_|\__,_|\__| |_____\___\___/|_| |_|

4
code/modules/admin/permissionverbs/permissionedit.dm
View File

@@ -145,13 +145,13 @@
return
if(admin_rights & new_permission) //This admin already has this permission, so we are removing it.
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = 0[admin_rights & ~new_permission] WHERE id = [admin_id]")
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = [admin_rights & ~new_permission] WHERE id = [admin_id]")
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');")
log_query.Execute()
usr << "\blue Permission removed."
else //This admin doesn't have this permission, so we are adding it.
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = 0'[admin_rights | new_permission]' WHERE id = [admin_id]")
var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]")
insert_query.Execute()
var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.`erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')")
log_query.Execute()

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

@@ -79,6 +79,7 @@
var/cover_hair = 0
var/see_invisible = 0
var/see_in_dark = 0
var/prescription = 0
species_restricted = list("exclude","Muton")
/*
SEE_SELF // can see self, no matter what

11
code/modules/clothing/glasses/glasses.dm
View File

@@ -1,13 +1,4 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
//w_class = 2.0
//flags = PL_HCE
//slot_flags = SLOT_EYES
//var/vision_flags = 0
//var/darkness_view = 0//Base human is 2
//var/invisa_view = 0
var/prescription = 0
//the basic glasses can be found in clothing.dm
/obj/item/clothing/glasses/meson
name = "Optical Meson Scanner"

2
code/modules/clothing/head/helmet.dm
View File

@@ -58,7 +58,7 @@
desc = "Ave, Imperator, morituri te salutant."
icon_state = "gladiator"
flags = FPRINT|BLOCKHAIR
body_parts_covered = HEAD|EYES|MOUTH
body_parts_covered = FULL_HEAD
item_state = "gladiator"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
siemens_coefficient = 1

4
code/modules/clothing/head/misc.dm
View File

@@ -69,6 +69,7 @@
item_state = "syndicate"
desc = "A plastic replica of a syndicate agent's space helmet, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
flags = FPRINT | BLOCKHAIR
body_parts_covered = FULL_HEAD
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
siemens_coefficient = 2.0
@@ -253,6 +254,7 @@
item_state = "xenos_helm"
desc = "A helmet made out of chitinous alien hide."
flags = FPRINT | BLOCKHAIR
body_parts_covered = FULL_HEAD
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
siemens_coefficient = 2.0
@@ -263,7 +265,7 @@
item_state = "bmhead"
flags = FPRINT | BLOCKHAIR
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
body_parts_covered = HEAD|EYES
body_parts_covered = HEAD|EYES|EARS
/obj/item/clothing/head/stalhelm
name = "Stalhelm"

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

@@ -23,7 +23,7 @@
var/up = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
body_parts_covered = HEAD|EYES|MOUTH
body_parts_covered = HEAD|EYES|MOUTH|EARS //using this instead of FULL_HEAD to show how the flags change in the code
action_button_name = "Toggle Welding Helmet"
siemens_coefficient = 0.9
species_fit = list("Vox")
@@ -40,13 +40,13 @@
if(usr.canmove && !usr.stat && !usr.restrained())
if(src.up)
src.up = !src.up
src.body_parts_covered |= (EYES|MOUTH)
src.body_parts_covered |= (EYES|MOUTH|EARS)
flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = initial(icon_state)
usr << "You flip the [src] down to protect your eyes."
else
src.up = !src.up
src.body_parts_covered &= ~(EYES|MOUTH)
src.body_parts_covered &= ~(EYES|MOUTH|EARS)
flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE)
icon_state = "[initial(icon_state)]up"
usr << "You push the [src] up out of your face."