Replaces /image with /mutable_appearance (#556)

* Replaces /image with /mutable_appearance, where appropriate

* Update miscellaneous.dm

* Delete miscellaneous.dm.rej

* Delete pet.dm.rej

* Update pet.dm

* Update species.dm

* Update miscellaneous.dm

* Update species.dm

* Update miscellaneous.dm

* Delete species.dm.rej

* Update species.dm

pretty sure I got all the indentation correct THIS time, ffs

* Update species.dm

* Update species.dm

fucking tabs man, fucking tabs.
This commit is contained in:
CitadelStationBot
2017-04-26 08:18:35 -05:00
committed by Poojawa
parent a8c4c86e1c
commit a905c15dad
151 changed files with 1379 additions and 1531 deletions
+1 -3
View File
@@ -336,12 +336,10 @@
return
stamps += "<img src=large_[P.icon_state].png>"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
var/mutable_appearance/stampoverlay = mutable_appearance('icons/obj/bureaucracy.dmi', "paper_[P.icon_state]")
stampoverlay.pixel_x = rand(-2, 2)
stampoverlay.pixel_y = rand(-3, 2)
stampoverlay.icon_state = "paper_[P.icon_state]"
LAZYADD(stamped, P.icon_state)
add_overlay(stampoverlay)
+1 -1
View File
@@ -135,7 +135,7 @@
icon_state = "[initial(icon_state)]"
cut_overlays()
if(bin_pen)
add_overlay(image(icon=bin_pen.icon,icon_state=bin_pen.icon_state))
add_overlay(mutable_appearance(bin_pen.icon, bin_pen.icon_state))
/obj/item/weapon/paper_bin/construction
name = "construction paper bin"
+1 -2
View File
@@ -44,8 +44,7 @@
var/list/stamped = internalPaper.stamped
if(stamped)
for(var/S in stamped)
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[stamped]")
add_overlay(stampoverlay)
add_overlay("paperplane_[S]")
/obj/item/weapon/paperplane/attack_self(mob/user)
to_chat(user, "<span class='notice'>You unfold [src].</span>")