Clean up the horrific mess of 6bae633 through 468944f

CODE STYLE MATTERS
This commit is contained in:
Tigercat2000
2016-05-25 15:27:00 -07:00
parent 6df65908e6
commit 50fce53b8c
5 changed files with 47 additions and 56 deletions
+1 -1
View File
@@ -982,7 +982,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space
qdel(frommob)
if(istype(tothing, /mob/living))
if(isliving(tothing))
var/mob/living/tomob = tothing
var/question = ""
+1 -4
View File
@@ -218,10 +218,7 @@
desc = "Somehow these seem even more out-of-date than normal sunglasses."
action_button_name = "Noir Mode"
var/noir_mode = 0
color_view = list(0.3, 0.3, 0.3, 0,\
0.3, 0.3, 0.3, 0,\
0.3, 0.3, 0.3, 0,\
0.0, 0.0, 0.0, 1,) //greyscale
color_view = MATRIX_GREYSCALE
/obj/item/clothing/glasses/sunglasses/noir/attack_self()
if(is_equipped())
@@ -34,7 +34,6 @@
/mob/living/simple_animal/possessed_object/start_pulling(var/atom/movable/AM) // Silly motherfuckers think they can pull things.
to_chat(src, "<span class='warning'>You are unable to pull [AM]!</span>")
return
/mob/living/simple_animal/possessed_object/ghost() // Ghosting will return the object to normal, and will not disqualify the ghoster from various mid-round antag positions.
@@ -121,7 +120,7 @@
/mob/living/simple_animal/possessed_object/get_access() // If we've possessed an ID card we've got access to lots of fun things!
if(istype(possessed_item, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/possessed_id = possessed_item
.= possessed_id.access
. = possessed_id.access
/mob/living/simple_animal/possessed_object/ClickOn(var/atom/A, var/params)