Merge pull request #14698 from Firecage/absolutepathsandifs

Absolute paths and changes one liner if's/else's/else if's.
This commit is contained in:
Razharas
2016-01-29 03:15:12 +03:00
244 changed files with 5962 additions and 4437 deletions
+6 -3
View File
@@ -194,9 +194,12 @@ LINEN BINS
/obj/structure/bedsheetbin/update_icon()
switch(amount)
if(0) icon_state = "linenbin-empty"
if(1 to 5) icon_state = "linenbin-half"
else icon_state = "linenbin-full"
if(0)
icon_state = "linenbin-empty"
if(1 to 5)
icon_state = "linenbin-half"
else
icon_state = "linenbin-full"
/obj/structure/bedsheetbin/fire_act()
if(!amount)
@@ -42,7 +42,8 @@
if(src.broken)
user << "<span class='danger'>It appears to be broken.</span>"
return
if(!I || !I.registered_name) return
if(!I || !I.registered_name)
return
if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name)))
//they can open all lockers, or nobody owns this, or they own this locker
src.locked = !( src.locked )
@@ -91,7 +91,7 @@
for(var/i in 1 to 4)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
/obj/structure/closet/crate/hydroponics
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
+4 -2
View File
@@ -51,7 +51,8 @@
/obj/structure/grille/attack_alien(mob/living/user)
user.do_attack_animation(src)
if(istype(user, /mob/living/carbon/alien/larva)) return
if(istype(user, /mob/living/carbon/alien/larva))
return
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("<span class='warning'>[user] mangles [src].</span>", \
@@ -66,7 +67,8 @@
/obj/structure/grille/attack_slime(mob/living/simple_animal/slime/user)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
if(!user.is_adult) return
if(!user.is_adult)
return
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
user.visible_message("<span class='warning'>[user] smashes against [src].</span>", \
+2 -1
View File
@@ -86,7 +86,8 @@ FLOOR SAFES
/obj/structure/safe/Topic(href, href_list)
if(!ishuman(usr)) return
if(!ishuman(usr))
return
var/mob/living/carbon/human/user = usr
var/canhear = 0