[pull] master from Aurorastation:master

code/game/objects/items/weapons/surgery_tools.dm

@@ -26,7 +26,7 @@
  */
 /obj/item/surgery/retractor
 	name = "retractor"
-	desc = "A surgical instrument which allows careful opening of incisions to reach inside someone."
+	desc = "A pair of retractor forceps. Allows careful opening of incisions to reach inside someone."
 	icon_state = "retractor"
 	item_state = "retractor"
 	matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 5000)
@@ -38,7 +38,7 @@
  */
 /obj/item/surgery/hemostat
 	name = "hemostat"
-	desc = "Primarily utilized to control initial incision bleeding, this instrument allows for careful removal of objects inside someone."
+	desc = "A pair of hemostatic forceps, able to clamp blood vessels shut to stop bleeding during surgery. Its narrow tip also lets it double as a tool for removing things from surgical sites."
 	icon_state = "hemostat"
 	item_state = "hemostat"
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
@@ -51,7 +51,7 @@
  */
 /obj/item/surgery/cautery
 	name = "cautery"
-	desc = "A specialized surgical tool which applies just enough heat to safely close surgical incisions, when used correctly at least."
+	desc = "An electrocautery pen. Uses electrical currents to burn tissue closed, useful for quickly sealing wounds or incisions."
 	icon_state = "cautery"
 	item_state = "cautery"
 	matter = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 2500)
@@ -64,7 +64,7 @@
  */
 /obj/item/surgery/surgicaldrill
 	name = "surgical drill"
-	desc = "A drill specialized for surgical use, capable of creating surgical cavities and safely breaching through Vaurcae carapace for initial incisions."
+	desc = "A drill specialized for surgical use. Capable of creating surgical cavities and safely breaching through Vaurcae carapace for initial incisions."
 	icon_state = "drill"
 	item_state = "drill"
 	hitsound = /singleton/sound_category/drillhit_sound
@@ -82,7 +82,7 @@
  */
 /obj/item/surgery/scalpel
 	name = "scalpel"
-	desc = "A metallic scalpel with long-lasting edge. Used in a variety of surgical situations from incisions, to transplants, to debridements."
+	desc = "A surgical-grade scalpel with an incredibly sharp blade that keeps its edge. Used in a variety of surgical situations from incisions, to transplants, to debridements."
 	icon_state = "scalpel"
 	item_state = "scalpel"
 	flags = CONDUCT
@@ -133,8 +133,8 @@
  * Circular Saw
  */
 /obj/item/surgery/circular_saw
-	name = "circular saw"
-	desc = "A circular bone saw specialized for cutting through bones, amputations, and even hardsuits if required."
+	name = "surgical saw"
+	desc = "A reciprocating electric bonesaw. While designed to cut through bone, it's powerful enough to cut limbs and even hardsuits if necessary. Watch your fingers."
 	icon_state = "saw"
 	item_state = "saw"
 	hitsound = 'sound/weapons/saw/circsawhit.ogg'
@@ -155,7 +155,7 @@
 // Miscellanous
 /obj/item/surgery/bone_gel
 	name = "bone gel"
-	desc = "A highly specialized gel which promotes fast bone healing."
+	desc = "A bottle-and-nozzle applicator containing a specialized gel. When applied to bone tissue, it can reinforce and repair breakages and act as a glue to keep bones in place while they heal."
 	icon_state = "bone-gel"
 	item_state = "bone-gel"
 	force = 2
@@ -164,8 +164,8 @@
 	pickup_sound = 'sound/items/pickup/bottle.ogg'
 
 /obj/item/surgery/fix_o_vein
-	name = "FixOVein"
-	desc = "A specialized surgical instrument capable of quickly and safely healing torn veins and arteries, being capable of repairing torn ligaments as well."
+	name = "vascular recoupler"
+	desc = "An advanced automatic surgical instrument that operates with extreme finesse. It can quickly and safely repair and recouple ruptured blood vessels and ligaments using highly elaborate, biodegradable microsutures. It can also be used for transplantations to attach organs to the body."
 	icon_state = "fixovein"
 	item_state = "fixovein"
 	force = 2
@@ -177,7 +177,7 @@
 
 /obj/item/surgery/bonesetter
 	name = "bone setter"
-	desc = "A surgical tool designed to firmly set damaged bones back together for proper healing."
+	desc = "A pair of forceps with a screw. It's designed to manipulate bones and hold them together, and is best paired with a bottle of bone gel for mending fractures."
 	icon_state = "bonesetter"
 	item_state = "bonesetter"
 	force = 8

code/game/objects/structures/crates_lockers/closets.dm

@@ -653,14 +653,13 @@
 			var/obj/O = A
 			O.hear_talk(M, text, verb, speaking)
 
-/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "destroys", var/wallbreaker)
+/obj/structure/closet/attack_generic(var/mob/user, var/damage, var/attack_message = "attacks", var/wallbreaker)
 	if(!damage || !wallbreaker)
 		return
 	user.do_attack_animation(src)
-	visible_message(SPAN_DANGER("[user] [attack_message] the [src]!"))
-	dump_contents()
-	QDEL_IN(src, 1)
-	return 1
+	visible_message(SPAN_DANGER("[user] [attack_message] \the [src]!"))
+	damage(damage)
+	return TRUE
 
 /obj/structure/closet/proc/req_breakout()
 	if(!opened) //Door's open... wait, why are you in it's contents then?

code/game/turfs/turf.dm

@@ -391,7 +391,7 @@ var/const/enterloopsanity = 100
 		if(istype(src, /turf/simulated))
 			var/turf/simulated/T = src
 			T.dirt = 0
-			T.color = null
+			T.color = initial(color)
 		for(var/obj/effect/O in src)
 			if(istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
 				qdel(O)

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -44,6 +44,8 @@
 	pass_flags = PASSTABLE
 	density = 0
 	mob_size = 3
+	destroy_surroundings = FALSE
+
 
 /mob/living/simple_animal/hostile/retaliate/shantak
 	name = "shantak"
@@ -65,6 +67,7 @@
 	speak = list("Shuhn","Shrunnph?","Shunpf")
 	emote_see = list("scratches the ground","shakes out it's mane","tinkles gently")
 	mob_size = 5
+	break_stuff_probability = 1
 
 /mob/living/simple_animal/yithian
 	name = "yithian"
@@ -90,4 +93,4 @@
 	density = 0
 	mob_size = 1.5
 	canbrush = TRUE
-	brush = /obj/item/reagent_containers/glass/rag
+	brush = /obj/item/reagent_containers/glass/rag

code/modules/mob/living/simple_animal/hostile/bat.dm

@@ -38,6 +38,7 @@
 	minbodytemp = 0
 
 	environment_smash = 1
+	destroy_surroundings = FALSE
 
 	faction = "scarybat"
 	flying = TRUE

code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm

@@ -28,7 +28,7 @@
 	speed = 4
 	projectiletype = /obj/item/projectile/beam/cavern
 	projectilesound = 'sound/magic/lightningbolt.ogg'
-	destroy_surroundings = 1
+	break_stuff_probability = 2
 
 	emote_see = list("stares","hovers ominously","blinks")
 
@@ -98,7 +98,7 @@
 	emote_hear = list("chirps cheerfully","buzzes","whirrs","hums placidly","chirps","hums")
 	projectiletype = /obj/item/projectile/beam/plasmacutter
 	projectilesound = 'sound/weapons/plasma_cutter.ogg'
-	destroy_surroundings = 1
+	destroy_surroundings = FALSE
 	min_oxy = 0
 	max_oxy = 0
 	min_tox = 0

code/modules/mob/living/simple_animal/hostile/space_fauna.dm

@@ -255,6 +255,7 @@
 	health = 5
 	mob_size = 2
 	density = FALSE
+	destroy_surroundings = FALSE
 
 	blood_overlay_icon = 'icons/mob/npc/blood_overlay_carp.dmi'
 	harm_intent_damage = 5

code/modules/mob/living/simple_animal/hostile/toy/mech.dm

@@ -19,6 +19,7 @@
 	speed = 2
 	mob_size = MOB_MINISCULE
 	tameable = FALSE
+	destroy_surroundings = FALSE
 
 	blood_overlay_icon = null
 

code/modules/tables/tables.dm

@@ -52,6 +52,13 @@
 			visible_message(SPAN_WARNING("\The [src] breaks down!"), intent_message = THUNK_SOUND)
 		return break_to_parts() // if we break and form shards, return them to the caller to do !FUN! things with
 
+/obj/structure/table/attack_generic(var/mob/user, var/damage, var/attack_message = "attacks", var/wallbreaker)
+	if(!damage || !wallbreaker)
+		return
+	user.do_attack_animation(src)
+	visible_message(SPAN_DANGER("[user] [attack_message] \the [src]!"))
+	take_damage(damage)
+	return TRUE
 
 /obj/structure/table/ex_act(severity)
 	switch(severity)

html/changelog.html

@@ -35,6 +35,26 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">13 July 2023</h2>
+			<h3 class="author">Doxxmedearly updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Simple mobs should no longer destroy closets and tables in one hit. They&#x27;ll damage them as usual.</li>
+				<li class="tweak">Some animals, like diyaabs and toy mechs, no longer randomly destroy their surroundings.</li>
+				<li class="tweak">Some animals, like cavern dwellers and shantaks, are less likely to randomly damage their surroundings.</li>
+				<li class="bugfix">You can no longer scrub the color out of wood floors with soap, no matter how hard you try.</li>
+			</ul>
+			<h3 class="author">OolongCow updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="maptweak">Hydroponics&#x27; viewing shutters now start closed and deck one&#x27;s shutters are linked to an actual button.</li>
+				<li class="bugfix">Fixes a misplaced area and air alarm in deck one hydro&#x27;s animal pen</li>
+			</ul>
+			<h3 class="author">nauticall updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="imageadd">Resprited all basic surgical tools as well as the surgical tray they rest on. They can now be clicked with a higher than 30% accuracy rate and look, subjectively, prettier than before.</li>
+				<li class="imageadd">Also resprited the basic and premium hyposprays to be up to modern standards. They, too, are now subjectively prettier.</li>
+				<li class="tweak">Changed descriptions of surgical tools and also renamed the FixOVein to the vascular recoupler.</li>
+			</ul>
+
 			<h2 class="date">12 July 2023</h2>
 			<h3 class="author">Doxxmedearly updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -29949,3 +29949,25 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
       button, and begin closed.
   - maptweak: Replaces the research server room nitrogen can with a pre-chilled variant
       to save on headache medication for engineers
+2023-07-13:
+  Doxxmedearly:
+  - bugfix: Simple mobs should no longer destroy closets and tables in one hit. They'll
+      damage them as usual.
+  - tweak: Some animals, like diyaabs and toy mechs, no longer randomly destroy their
+      surroundings.
+  - tweak: Some animals, like cavern dwellers and shantaks, are less likely to randomly
+      damage their surroundings.
+  - bugfix: You can no longer scrub the color out of wood floors with soap, no matter
+      how hard you try.
+  OolongCow:
+  - maptweak: Hydroponics' viewing shutters now start closed and deck one's
+      shutters are linked to an actual button.
+  - bugfix: Fixes a misplaced area and air alarm in deck one hydro's animal pen
+  nauticall:
+  - imageadd: Resprited all basic surgical tools as well as the surgical tray they
+      rest on. They can now be clicked with a higher than 30% accuracy rate and look,
+      subjectively, prettier than before.
+  - imageadd: Also resprited the basic and premium hyposprays to be up to modern standards.
+      They, too, are now subjectively prettier.
+  - tweak: Changed descriptions of surgical tools and also renamed the FixOVein to
+      the vascular recoupler.