diff --git a/code/game/objects/contraband.dm b/code/game/objects/contraband.dm index 3c465d2b794..f28b24f1cb2 100644 --- a/code/game/objects/contraband.dm +++ b/code/game/objects/contraband.dm @@ -130,10 +130,10 @@ obj/effect/decal/poster/New(var/serial) if(15) name += " - Leviating Skull" desc += " This particular one is the portrait of a certain flying, friendly and somewhat sex-crazed enchanted skull. Its adventures along with its fabled companion are now fading through history..." - if(17) + if(16) name += " - Augmented Legend" desc += " This particular one is of an obviously augmented individual, gazing towards the sky. The cyber-city in the backround is rather punkish." - if(18) + if(17) name += " - Dangerous Static" desc += " This particular one depicts nothing remarkable other than a rather mesmerising pattern of monitor static. There's a tag on the sides of the poster, urging you to \"tear this poster in half to receive your free sample\"." else @@ -149,14 +149,10 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) del(src) else user << "You carefully remove the poster from the wall." - var/obj/item/weapon/contraband/poster/P = new(src,src.serial_number) - P.resulting_poster = src - P.loc = user.loc - src.loc = P + src.roll_and_drop(user.loc) return - /obj/effect/decal/poster/attack_hand(mob/user as mob) if(src.ruined) return @@ -174,4 +170,10 @@ obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob) src.desc = "You can't make out anything from the poster's original print. It's ruined." src.add_fingerprint(user) if("No") - return \ No newline at end of file + return + +/obj/effect/decal/poster/proc/roll_and_drop(turf/loc) + var/obj/item/weapon/contraband/poster/P = new(src,src.serial_number) + P.resulting_poster = src + P.loc = loc + src.loc = P diff --git a/code/game/turf.dm b/code/game/turf.dm index 7f9a25b048e..ed7dc95a734 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -306,6 +306,12 @@ new /obj/item/stack/sheet/metal( src ) new /obj/item/stack/sheet/metal( src ) + for(var/obj/O in src.contents) //Eject contents! + if(istype(O,/obj/effect/decal/poster)) + var/obj/effect/decal/poster/P = O + P.roll_and_drop(src) + else + O.loc = src ReplaceWithPlating(explode) /turf/simulated/wall/examine() diff --git a/html/changelog.html b/html/changelog.html index 88e6c31a4d5..646399d29f5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -93,6 +93,21 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

April 10, the year of our lord 2012

+

Agouri updated:

+ +
+

Monday, April 9th

Petethegoat updated:

diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index 3edac97081b..d31dde2c514 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ