diff --git a/code/modules/overmap/exoplanets/decor/_turfs.dm b/code/modules/overmap/exoplanets/decor/_turfs.dm index 587fdae5bb5..cc8759187ca 100644 --- a/code/modules/overmap/exoplanets/decor/_turfs.dm +++ b/code/modules/overmap/exoplanets/decor/_turfs.dm @@ -115,18 +115,6 @@ /turf/simulated/floor/exoplanet/water/update_dirt() return // Water doesn't become dirty -//Ice -/turf/simulated/floor/exoplanet/ice - name = "ice" - icon = 'icons/turf/flooring/snow.dmi' - icon_state = "ice" - -/turf/simulated/floor/exoplanet/ice/update_icon() - return - -/turf/simulated/floor/exoplanet/ice/dark - icon_state = "icedark" - //Snow /turf/simulated/floor/exoplanet/snow name = "snow" diff --git a/code/modules/overmap/exoplanets/decor/turfs/ice.dm b/code/modules/overmap/exoplanets/decor/turfs/ice.dm index 33263bddcc9..ffe601669e4 100644 --- a/code/modules/overmap/exoplanets/decor/turfs/ice.dm +++ b/code/modules/overmap/exoplanets/decor/turfs/ice.dm @@ -1,6 +1,6 @@ /turf/simulated/floor/exoplanet/ice name = "ice" - icon = 'icons/turf/smooth/snow.dmi' + icon = 'icons/turf/flooring/snow.dmi' icon_state = "ice" footprint_color = FALSE diff --git a/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm b/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm index 9a265d53c4d..e66212a6fe5 100644 --- a/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm +++ b/code/modules/overmap/ship_weaponry/weaponry/longbow_ammo.dm @@ -147,7 +147,9 @@ /obj/item/warhead/longbow/attackby(obj/item/attacking_item, mob/user) . = ..() - if(attacking_item.force > 10) + if(istype(attacking_item, /obj/item/mecha_equipment/clamp)) //loading a warhead into a mech shouldn't explode it + return + if(attacking_item.force > 10 && user.a_intent == I_HURT) //presumably you need to hit it pretty hard to actually set the thing off cookoff(FALSE) /obj/item/warhead/longbow/ex_act(severity) diff --git a/html/changelogs/RustingWithYou - miscfixes.yml b/html/changelogs/RustingWithYou - miscfixes.yml new file mode 100644 index 00000000000..23781d56f24 --- /dev/null +++ b/html/changelogs/RustingWithYou - miscfixes.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: RustingWithYou + +# 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: "Fixes Longbow warheads exploding when picked up by mechs." + - bugfix: "Fixes ice exoplanet turfs being invisible." + - bugfix: "Fixes the Haneunim shuttle crash from leaving its thrusters behind on launch." diff --git a/icons/obj/clothing/voidsuit/mercenary.dmi b/icons/obj/clothing/voidsuit/mercenary.dmi index bd378313963..5d87a7351eb 100644 Binary files a/icons/obj/clothing/voidsuit/mercenary.dmi and b/icons/obj/clothing/voidsuit/mercenary.dmi differ diff --git a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm index 36bd4b6cb6c..eef9129f397 100644 --- a/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm +++ b/maps/random_ruins/exoplanets/haneunim/haneunim_crash.dmm @@ -35,7 +35,7 @@ /area/shuttle/haneunim_crash) "hF" = ( /obj/machinery/atmospherics/unary/engine, -/turf/template_noop, +/turf/simulated/floor/airless, /area/shuttle/haneunim_crash) "hP" = ( /obj/effect/floor_decal/corner/paleblue/diagonal,