TG: - Moved three (well two, one was doubled for some reason) screen/attackby()

procs to appear AFTER the screen object is defined. They were in a random file
instead of where the objects are. If you double-click and 'screen' object in the
object browser it now takes you to the definition instead of some random file.

- Clicking a grille with a glass or r-glass sheet in your hand, when the grille
is in one of your cardinal directions (North, south, east or west) will make you
start building a window. It takes 2s to build the window, which spawns
unfastened (same as when you create one.) This should make fixing damaged
grille-window combinations easier. If you are standing on a grille and click it
with a glass / r-glass sheet in your hand, the window will face the direction
you're currently facing.

Screenshot:
http://www.kamletos.si/placing%20windows%20on%20grilles.PNG
Revision: r3081
Author: 	 baloh.matevz
This commit is contained in:
Ren Erthilo
2012-04-22 19:22:02 +01:00
parent 464cfd49f7
commit bc02dbff87
6 changed files with 56 additions and 13 deletions
+2 -5
View File
@@ -75,6 +75,7 @@
if (cx > mx)
cx = tx
cy--
//Foreach goto(56)
src.closer.screen_loc = text("[],[]", mx, my)
return
@@ -94,7 +95,7 @@
/obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if ((istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
if(istype(W, /obj/item/weapon/card/emag))
var/obj/item/weapon/card/emag/E = W
if(E.uses)
@@ -260,7 +261,3 @@
src.orient_objs(7, 8, 10, 7)
return
return
/obj/screen/storage/attackby(W, mob/user as mob)
src.master.attackby(W, user)
return