From 9b3c407894b8afb070259fb441f2f98f6429df4d Mon Sep 17 00:00:00 2001 From: zevo <95449138+Zevotech@users.noreply.github.com> Date: Fri, 6 Sep 2024 05:55:30 -0400 Subject: [PATCH] Fixes the "pulse carbine" on whitesands_surface_camp_saloon again (#3331) ## About The Pull Request Fixes the missing sprite on a varedited gun on the map. Also changes the amount of money on the map since it was brought to my attention that it had 14k credits lying about. Adds a few gunner hermits for good measure. ## Why It's Good For The Game Invisible guns are bad. oh and ruins generally shouldnt have over 10k credits unless they warrant it. ## Changelog :cl: fix: The "pulse carbine" in the sandplanet saloon has a sprite again tweak: Added some extra mobs to the sandplanet saloon to balance out the money in it /:cl: --- .../SandRuins/whitesands_surface_camp_saloon.dmm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm index d4c307df25d7..219fc7a6b6b6 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_camp_saloon.dmm @@ -243,7 +243,7 @@ }, /obj/effect/turf_decal/siding/wood, /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/human/hermit/survivor, +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger, /turf/open/floor/wood, /area/ruin/whitesands/saloon) "gC" = ( @@ -445,7 +445,6 @@ "lI" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/lootdrop/gambling, -/obj/item/spacecash/bundle/loadsamoney, /turf/open/floor/carpet, /area/ruin/whitesands/saloon) "lV" = ( @@ -890,6 +889,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/hostile/human/hermit/survivor{ + dir = 4 + }, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -1029,7 +1031,8 @@ icon_state = "pulse_carbine"; name = "pulse rifle"; desc = "A supposedly heavy-duty, multifaceted energy rifle. The barrel looks off and the casing seems to be made of plastic"; - item_state = "pulse" + item_state = "pulse"; + icon = 'icons/obj/guns/manufacturer/nanotrasen_sharplite/48x32.dmi' }, /turf/open/floor/wood, /area/ruin/whitesands/saloon) @@ -1114,7 +1117,7 @@ /obj/structure/chair/stool/bar{ dir = 8 }, -/mob/living/simple_animal/hostile/human/hermit/survivor{ +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{ dir = 8 }, /turf/open/floor/wood, @@ -1497,7 +1500,7 @@ /area/ruin/whitesands/saloon) "Ua" = ( /obj/structure/chair/stool/bar, -/mob/living/simple_animal/hostile/human/hermit/survivor{ +/mob/living/simple_animal/hostile/human/hermit/ranged/gunslinger{ dir = 8 }, /turf/open/floor/wood{ @@ -1672,6 +1675,7 @@ pixel_y = 6; pixel_x = 3 }, +/obj/item/spacecash/bundle/loadsamoney, /turf/open/floor/carpet, /area/ruin/whitesands/saloon) "ZG" = (