New Map Bug Batch (#2473)

Fixes #2362 Fixes #2232 Fixes #2234 Fixes #2214 Fixes #2385 Fixes #2386 Fixes #2356 Fixes #2406 Fixes #2409 Fixes #2404 Fixes #2432 Fixes #2439 Fixes #2437 Removes "You hear a click from the bottom of the door" message from airlocks when they bolt/unbolt. Makes ghosttraps significantly easier to spot.
2025-12-27 10:32:08 +00:00 · 2017-05-27 15:43:48 -04:00
parent 47666d2835
commit 4e09ed8a73
11 changed files with 1304 additions and 1549 deletions
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -637,13 +637,13 @@ About the new airlock wires panel:
 		if("opening")
 			cut_overlays()
 			if(p_open)
-				flick("o_door_opening", src)  
+				flick("o_door_opening", src)
 				update_icon()
 			else
 				flick("door_opening", src)//[stat ? "_stat":]
 				update_icon()
 		if("closing")
-			if(overlays) 
+			if(overlays)
 				cut_overlays()
 			if(p_open)
 				flick("o_door_closing", src)
@@ -982,7 +982,7 @@ About the new airlock wires panel:
 			O.show_message("[src.name]'s control panel bursts open, sparks spewing out!")

 	spark(src, 5, alldirs)
-	
+
 	update_icon()
 	return

@@ -1121,7 +1121,6 @@ About the new airlock wires panel:
 	if (operating && !forced) return 0
 	src.locked = 1
 	playsound(src, bolts_dropping, 30, 0, -6)
-	audible_message("You hear a click from the bottom of the door.")
 	update_icon()
 	return 1

@@ -1132,7 +1131,6 @@ About the new airlock wires panel:
 		if(operating || !src.arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) return
 	src.locked = 0
 	playsound(src, bolts_rising, 30, 0, -6)
-	audible_message("You hear a click from the bottom of the door.")
 	update_icon()
 	return 1

--- a/code/game/machinery/vending_types.dm
+++ b/code/game/machinery/vending_types.dm
@@ -407,6 +407,42 @@
 	premium = list(
 		/obj/item/toy/waterflower = 1
 	)
+	prices = list(
+		/obj/item/seeds/bananaseed = 30,
+		/obj/item/seeds/berryseed = 15,
+		/obj/item/seeds/carrotseed = 15,
+		/obj/item/seeds/chantermycelium = 5,
+		/obj/item/seeds/chiliseed = 10,
+		/obj/item/seeds/cornseed = 15,
+		/obj/item/seeds/eggplantseed = 10,
+		/obj/item/seeds/potatoseed = 10,
+		/obj/item/seeds/replicapod = 175,
+		/obj/item/seeds/soyaseed = 10,
+		/obj/item/seeds/sunflowerseed = 5,
+		/obj/item/seeds/tomatoseed = 15,
+		/obj/item/seeds/towermycelium = 5,
+		/obj/item/seeds/wheatseed = 5,
+		/obj/item/seeds/appleseed = 15,
+		/obj/item/seeds/poppyseed = 20,
+		/obj/item/seeds/sugarcaneseed = 12,
+		/obj/item/seeds/ambrosiavulgarisseed = 90,
+		/obj/item/seeds/peanutseed = 25,
+		/obj/item/seeds/whitebeetseed = 20,
+		/obj/item/seeds/watermelonseed = 15,
+		/obj/item/seeds/limeseed = 15,
+		/obj/item/seeds/lemonseed = 15,
+		/obj/item/seeds/orangeseed = 15,
+		/obj/item/seeds/grassseed = 2,
+		/obj/item/seeds/cocoapodseed = 25,
+		/obj/item/seeds/plumpmycelium = 30,
+		/obj/item/seeds/cabbageseed = 15,
+		/obj/item/seeds/grapeseed = 15,
+		/obj/item/seeds/pumpkinseed = 25,
+		/obj/item/seeds/cherryseed = 25,
+		/obj/item/seeds/plastiseed = 25,
+		/obj/item/seeds/riceseed = 25,
+		/obj/item/seeds/koisspore = 30
+	)

 /**
 *  Populate hydroseeds product_records
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -16,6 +16,7 @@
 	icon_state = "shuttle3"
 	requires_power = 0
 	station_area = 1
+	dynamic_lighting = 0

 /area/supply/dock
 	name = "Supply Shuttle"
--- a/code/modules/ghosttrap/trap.dm
+++ b/code/modules/ghosttrap/trap.dm
@@ -64,7 +64,7 @@ var/list/ghost_traps
 		if(pref_check && !(pref_check in O.client.prefs.be_special_role))
 			continue
 		if(O.client)
-			O << "[request_string] <a href='?src=\ref[src];candidate=\ref[O];target=\ref[target]'>(Occupy)</a> ([ghost_follow_link(target, O)])"
+			O << "<span class='deadsay'><font size=3><b>[request_string] <a href='?src=\ref[src];candidate=\ref[O];target=\ref[target]'>(Occupy)</a> ([ghost_follow_link(target, O)])</b></font></span>"

 /datum/ghosttrap/proc/target_destroyed(var/destroyed_target)
 	request_timeouts -= destroyed_target
@@ -211,6 +211,10 @@ datum/ghosttrap/drone/transfer_personality(var/mob/candidate, var/mob/living/sil
 	if(!assess_candidate(candidate))
 		return 0
 	drone.transfer_personality(candidate.client)
+	var/tmp_health = drone.health
+	drone.revive()
+	drone.health = tmp_health
+	drone.updatehealth()

 /***********************************
 * Syndicate Cyborg *
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -73,59 +73,43 @@

 	else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))

-		if(stat == 2)
+		var/choice = input("Select your choice.") in list("Reboot","Recycle")
+		if(choice=="Reboot")

-			var/choice = input("Look at your icon - is this what you want?") in list("Reboot","Recycle")
-			if(choice=="Reboot")
-
-				if(!config.allow_drone_spawn || emagged || health < -maxHealth) //It's dead, Dave.
-					user << "<span class='danger'>The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.</span>"
-					return
-
-				if(!allowed(usr))
-					user << "<span class='danger'>Access denied.</span>"
-					return
-
-				user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], attempting to reboot it.</span>", "<span class='danger'>>You swipe your ID card through \the [src], attempting to reboot it.</span>")
-				request_player()
+			if(!config.allow_drone_spawn || emagged || health < -maxHealth) //It's dead, Dave.
+				user << "<span class='danger'>The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.</span>"
 				return

-			else
-				var/obj/item/weapon/card/id/ID = W
-				if(!allowed(usr))
-					user << "<span class='danger'>Access denied.</span>"
-					return
-
-				user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], recycling it into points.</span>", "<span class='danger'>>You swipe your ID card through \the [src], recycling it into points.</span>")
-				ID.mining_points += 800
-				if(health_upgrade)
-					ID.mining_points += 600
-					health_upgrade = 0
-				if(ranged_upgrade)
-					ID.mining_points += 600
-					ranged_upgrade = 0
-				if(melee_upgrade)
-					ID.mining_points += 400
-					melee_upgrade = 0
-				if(drill_upgrade)
-					ID.mining_points += 2000
-					drill_upgrade = 0
-				qdel(src)
+			if(!allowed(usr))
+				user << "<span class='danger'>Access denied.</span>"
 				return

+			user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], attempting to reboot it.</span>", "<span class='danger'>>You swipe your ID card through \the [src], attempting to reboot it.</span>")
+			request_player()
+			return
+
 		else
-			user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], attempting to shut it down.</span>", "<span class='danger'>You swipe your ID card through \the [src], attempting to shut it down.</span>")
-
-			if(emagged)
+			var/obj/item/weapon/card/id/ID = W
+			if(!allowed(usr))
+				user << "<span class='danger'>Access denied.</span>"
 				return

-			if(allowed(usr))
-				shut_down()
-			else
-				user << "<span class='danger'>Access denied.</span>"
-
-		return
-
+			user.visible_message("<span class='danger'>\The [user] swipes \his ID card through \the [src], recycling it into points.</span>", "<span class='danger'>>You swipe your ID card through \the [src], recycling it into points.</span>")
+			ID.mining_points += 800
+			if(health_upgrade)
+				ID.mining_points += 600
+				health_upgrade = 0
+			if(ranged_upgrade)
+				ID.mining_points += 600
+				ranged_upgrade = 0
+			if(melee_upgrade)
+				ID.mining_points += 400
+				melee_upgrade = 0
+			if(drill_upgrade)
+				ID.mining_points += 2000
+				drill_upgrade = 0
+			qdel(src)
+			return
 	..()

 /mob/living/silicon/robot/drone/mining/verb/print_report()