TG: Fixed issue 287 , 290, 291

-Cutting/restoring cameras now leaves a print
-building certain overly-abused griff items leaves prints
-grenade launcher no longer shoots your face if you try to backpack it

Chameleon projector movement speed is now based on temperature
Added add_hiddenprint(mob) proc
it's like add_fingerprint but only adds to fingerprintshidden isn't that neat? r2898
This commit is contained in:
Ren Erthilo
2012-03-27 05:57:51 +01:00
parent 76336789d7
commit 77636ce696
6 changed files with 50 additions and 5 deletions
+11 -1
View File
@@ -25,7 +25,17 @@
relaymove(var/mob/user, direction)
if(can_move)
can_move = 0
spawn(10) can_move = 1
switch(usr.bodytemperature)
if(300 to INFINITY)
spawn(10) can_move = 1
if(295 to 300)
spawn(13) can_move = 1
if(280 to 295)
spawn(16) can_move = 1
if(260 to 280)
spawn(20) can_move = 1
else
spawn(25) can_move = 1
step(src,direction)
return
@@ -18,17 +18,19 @@ RACK PARTS
del(src)
/obj/item/weapon/table_parts/attack_self(mob/user as mob)
new /obj/structure/table( user.loc )
var/obj/structure/table/T = new /obj/structure/table( user.loc )
T.add_fingerprint(usr)
del(src)
return
// WOODEN TABLE PARTS
/obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/wood( src.loc )
//SN src = null
del(src)
else
..()
/obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
new /obj/structure/table/woodentable( user.loc )
+2 -1
View File
@@ -50,8 +50,9 @@ FLOOR TILES
usr << "\blue Assembling grille..."
if (!do_after(usr, 10))
return
new /obj/structure/grille( usr.loc )
var/obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc )
usr << "\blue You assemble a grille"
F.add_fingerprint(usr)
use(2)
return
+7 -1
View File
@@ -20,7 +20,7 @@
/obj/item/stack/examine()
set src in view(1)
..()
usr << text("There are [] []\s left on the stack.", src.amount, src.singular_name)
usr << "There are [src.amount] [src.singular_name]\s in the stack."
return
/obj/item/stack/proc/use(var/amount)
@@ -204,6 +204,12 @@
del(oldsrc)
if (istype(O,/obj/item))
usr.put_in_hand(O)
O.add_fingerprint(usr)
//BubbleWrap - so newly formed boxes are empty
if ( istype(O, /obj/item/weapon/storage) )
for (var/obj/item/I in O)
del(I)
//BubbleWrap END
if (src && usr.machine==src) //do not reopen closed window
spawn( 0 )
src.interact(usr)