Added Scottzar's emitter projectile sprite. Thanks!

Fixed some issues with paper.
Slightly adjusted the atmospheric door sprites.
Added some SMES assembly sprites.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2829 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-12-27 04:19:18 +00:00
parent d60b95e90c
commit b9c3f9ce65
8 changed files with 8 additions and 7 deletions
-5
View File
@@ -377,11 +377,6 @@
return src.attack_hand(user)
/obj/item/weapon/stamp/New()
..()
return
/obj/item/weapon/dice/attack_self(mob/user as mob) // Roll the dice -- TLE
var/temp_sides
if(src.sides < 1)
@@ -18,11 +18,16 @@ CLIPBOARDS
..()
src.pixel_y = rand(-8, 8)
src.pixel_x = rand(-9, 9)
spawn(2)
if(src.info)
src.overlays += "paper_words"
return
/obj/item/weapon/paper/update_icon()
if(src.info)
src.overlays += "paper_words"
return
/obj/item/weapon/paper/examine()
set src in view()
+1
View File
@@ -317,6 +317,7 @@ var/ordernum=0
reqform.info += "</ul><hr>"
reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:<br>"
reqform.update_icon() //Fix for appearing blank when printed.
reqtime = 5 //5 second cooldown initiated after each printed req, change the number to change the cooldown (in seconds) - Quarxink
spawn(0)
while(reqtime >=1 && src)
+1 -1
View File
@@ -87,7 +87,7 @@
src.shot_number = 0
use_power(1000)
var/obj/item/projectile/beam/A = new /obj/item/projectile/beam( src.loc )
A.icon_state = "u_laser"
A.icon_state = "emitter"
playsound(src.loc, 'emitter.ogg', 25, 1)
if(prob(35))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread