diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 39b0a1e8a8b..7af85a7086e 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -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) diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm index fe4e1d2486e..0b2c91fbaae 100644 --- a/code/game/objects/items/weapons/papers_bins.dm +++ b/code/game/objects/items/weapons/papers_bins.dm @@ -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() diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm index 8e6446eb7e4..ae94b6de4d9 100644 --- a/code/game/supplyshuttle.dm +++ b/code/game/supplyshuttle.dm @@ -317,6 +317,7 @@ var/ordernum=0 reqform.info += "
" reqform.info += "STAMP BELOW TO APPROVE THIS REQUISITION:
" + 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) diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 336478efb0f..3ec515dcb3f 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -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 diff --git a/icons/obj/doors/Dooratmo.dmi b/icons/obj/doors/Dooratmo.dmi index e4842ec1075..da1ae29271e 100644 Binary files a/icons/obj/doors/Dooratmo.dmi and b/icons/obj/doors/Dooratmo.dmi differ diff --git a/icons/obj/doors/door_assembly.dmi b/icons/obj/doors/door_assembly.dmi index 4993b59a1bd..1bb683043fe 100644 Binary files a/icons/obj/doors/door_assembly.dmi and b/icons/obj/doors/door_assembly.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 4ec4ad8360a..1d2dc870c7f 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 6ba602f58d0..e4b16583050 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ