diff --git a/code/game/gamemodes/events/holidays/Christmas.dm b/code/game/gamemodes/events/holidays/Christmas.dm index 5045065cef2..f6bc893e432 100644 --- a/code/game/gamemodes/events/holidays/Christmas.dm +++ b/code/game/gamemodes/events/holidays/Christmas.dm @@ -36,8 +36,8 @@ "Where do you find chili beans?\n\nThe north pole.", "What do you get from eating tree decorations?\n\nTinsilitis!", "What do snowmen wear on their heads?\n\nIce caps!", - "Why is Christmas just like life on ss13?\n\nYou do all the work and the fat guy gets all the credit.", - "Why doesn�t Santa have any children?\n\nBecause he only comes down the chimney.") + "Why is Christmas just like life in Nanotrasen?\n\nYou do all the work and the fat guy gets all the credit.", + "Why doesn't Santa have any children?\n\nBecause he only comes down the chimney.") Joke.set_content_unsafe(title, content) new /obj/item/clothing/head/festive(target.loc) user.update_icons() diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index f16ecb6c535..174dc7df360 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -12,6 +12,7 @@ name = "rolled-up poster" desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface." icon_state = "rolled_poster" + drop_sound = 'sound/items/drop/wrapper.ogg' var/serial_number = 0 @@ -60,7 +61,7 @@ var/obj/structure/sign/poster/P = new(user.loc, get_dir(user, W), serial_number) flick("poster_being_set", P) - //playsound(W, 'sound/items/poster_being_created.ogg', 100, 1) //why the hell does placing a poster make printer sounds? + playsound(W, 'sound/items/package_wrap.ogg', 100, 1) addtimer(CALLBACK(src, .proc/place_on_wall, P, user, W), 28, TIMER_CLIENT_TIME) @@ -84,7 +85,7 @@ anchored = 1 var/serial_number //Will hold the value of src.loc if nobody initialises it var/poster_type //So mappers can specify a desired poster - var/ruined = 0 + var/ruined = FALSE /obj/structure/sign/poster/Initialize(mapload, placement_dir = null, serial = null) . = ..() @@ -145,9 +146,13 @@ if(ruined || !user.Adjacent(src)) return + if(user.a_intent == I_HELP) + user.examinate(src) + return + visible_message("\The [user] rips \the [src] in a single, decisive motion!" ) playsound(src.loc, 'sound/items/poster_ripped.ogg', 100, 1) - ruined = 1 + ruined = TRUE icon_state = "poster_ripped" name = "ripped poster" desc = "You can't make out anything from the poster's original print. It's ruined." diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 808640bfa66..89f3b5d52a4 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -6,8 +6,7 @@ /obj/item/device/depth_scanner name = "depth analysis scanner" desc = "Used to check spatial depth and density of rock outcroppings." - icon = 'icons/obj/pda.dmi' - icon_state = "crap" + icon_state = "depthscanner" item_state = "analyzer" w_class = 2.0 slot_flags = SLOT_BELT diff --git a/html/changelogs/wezzy_poster_pissmass.yml b/html/changelogs/wezzy_poster_pissmass.yml new file mode 100644 index 00000000000..46ef77f06a3 --- /dev/null +++ b/html/changelogs/wezzy_poster_pissmass.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Wowzewow(Wezzy) + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Xenoarcheology depth scanner no longer invisible, with new sprite to boot!" + - tweak: "Clicking on posters with help-intent no longer rips it off the wall like a neanderthal, but instead examines it." + - tweak: "Tweaks some Christmas and device sprites." diff --git a/icons/obj/christmas.dmi b/icons/obj/christmas.dmi index 1d8fc7e5c50..9b18a81c43b 100644 Binary files a/icons/obj/christmas.dmi and b/icons/obj/christmas.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 53de4f6092d..1e7ca408a0f 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ