Merge remote-tracking branch 'origin/dev' into dev

Proxima-Project · Jul 4, 2023 · cb7b456 · cb7b456
2 parents 6591e26 + 0d84eba
commit cb7b456
Show file tree

Hide file tree

Showing 40 changed files with 1,140 additions and 730 deletions.
diff --git a/code/bos/game/gamemodes/mini_roles/mini_roles.dm b/code/bos/game/gamemodes/mini_roles/mini_roles.dm
@@ -1,4 +1,4 @@
-/datum/game_mode/mini_toles
+/datum/game_mode/mini_roles
 	name = "mini roles"
 	round_description = "Everybody have they own targets now!"
 	extended_round_description = "Pure chaos"
@@ -7,5 +7,4 @@
 	required_enemies = 0
 	antag_tags = list(MODE_MINI_ROLES)
 	antag_scaling_coeff = 1
-	end_on_antag_death = FALSE
 	latejoin_antag_tags = list(MODE_MINI_ROLES)
diff --git a/code/bos/modules/overmap/exoplanets/planet_types/desert.dm b/code/bos/modules/overmap/exoplanets/planet_types/desert.dm
@@ -128,6 +128,7 @@
 	if(buckled_mob)
 		overlays += buckled_mob
 		var/image/I = image(icon,icon_state="overlay")
+		I.plane = GAME_PLANE_FOV_HIDDEN
 		I.layer = ABOVE_HUMAN_LAYER
 		overlays += I
 

diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm
@@ -170,22 +170,28 @@
 /datum/trader/gmb
 	name = "Ward-Takahashi GMB"
 	origin = "Automated Manufacturing Station"
-	trade_flags = TRADER_MONEY
+	trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL
+	want_multiplier = 1
 	speech = list(TRADER_HAIL_GENERIC		= "Greetings! It's so nice to talk to a human instead of a robot... Ah, would you like to order some machine?",
 				TRADER_HAIL_DENY			= "I'm sorry, but the main AI has forbidden me to communicate with you...",
 
 				TRADER_TRADE_COMPLETE		= "Oh, lovely!",
-				TRADER_NO_BLACKLISTED		= "Whoa whoa, this one is too bad, put it away.",
-				TRADER_NO_GOODS   			= "Sorry, but we take only in money.",
 				TRADER_NOT_ENOUGH			= "Sorry, but there's not enough here for this order.",
+				TRADER_FOUND_UNWANTED		= "No-no, AI don't need this...",
 				TRADER_HOW_MUCH				= "AI say that for one entry of ITEM the price would be VALUE CURRENCY.",
+				TRADER_WHAT_WANT			= "Oh, for our industry we need some stock parts of machinery and powercells.",
 
 				TRADER_COMPLEMENT_FAILURE	= "I am afraid this is beyond my competency.",
 				TRADER_COMPLEMENT_SUCCESS	= "Thank you!",
 				TRADER_INSULT_GOOD			= "Alright, I transfer this to AI...",
 				TRADER_INSULT_BAD			= "AI probably will be mad..."
 				)
 
+	wanted_items  = list(
+						/obj/item/cell													= TRADER_ALL,
+						/obj/item/stock_parts											= TRADER_ALL
+						)
+
 	possible_trading_items = list(/obj/machinery/mining/drill							= TRADER_THIS_TYPE,
 								  /obj/machinery/mining/brace							= TRADER_THIS_TYPE,
 								  /obj/machinery/floodlight								= TRADER_THIS_TYPE,

diff --git a/code/datums/trading/ship.dm b/code/datums/trading/ship.dm
@@ -18,8 +18,8 @@
 	if(prob(-disposition))
 		return ..()
 
-	var/length = round(amt/100)
+	var/length = round(amt/50) //BoS, was round(amt/100)
 	duration_of_stay += length
 	var/datum/trade_response/tr = make_response(TRADER_BRIBE_SUCCESS, "Sure, I'll stay for TIME more minutes.", -amt, TRUE)
 	tr.text = replacetext_char(tr.text, "TIME", length)
-	return tr
+	return tr
diff --git a/code/datums/trading/unique.dm b/code/datums/trading/unique.dm
@@ -141,7 +141,7 @@
 	trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL
 	want_multiplier = 1
 	margin = 1.1
-	price_rng = 3
+	price_rng = 5
 	mob_transfer_message = "<span class='danger'>You have been teleported somewhere and have lost consciousness. When you come to, you find yourself in a clean white room attached to an operating table, surrounded by people in white coats. After the words: 'Commence surgery', you were taken apart piece by piece without anaesthesia for over an hour. Only death brought you salvation.</span>"
 
 	speech = list(TRADER_HAIL_GENERIC		= "Ah, greetings. We looking for some things for our corporation... All for the sake of science and human race.",
@@ -161,11 +161,11 @@
 				)
 
 	wanted_items  = list(
-						/mob/living/carbon/human									= TRADER_ALL,
-						/obj/item/organ/internal									= TRADER_ALL,
 						/mob/living/carbon/human/machine							= TRADER_BLACKLIST_ALL,
 						/obj/item/organ/internal/posibrain							= TRADER_BLACKLIST_ALL,
-						/obj/item/organ/internal/augment							= TRADER_BLACKLIST_ALL
+						/obj/item/organ/internal/augment							= TRADER_BLACKLIST_ALL,
+						/mob/living/carbon/human									= TRADER_ALL,
+						/obj/item/organ/internal									= TRADER_ALL
 						)
 
 	possible_trading_items = list(
@@ -175,5 +175,8 @@
 								/obj/item/reagent_containers/syringe/zombie										= TRADER_THIS_TYPE,
 								/obj/item/reagent_containers/glass/bottle/mutagen								= TRADER_THIS_TYPE,
 								/obj/item/reagent_containers/glass/bottle/pacid									= TRADER_THIS_TYPE,
-								/obj/item/reagent_containers/glass/bottle/chloralhydrate						= TRADER_THIS_TYPE
+								/obj/item/reagent_containers/glass/bottle/chloralhydrate						= TRADER_THIS_TYPE,
+								/obj/item/storage/firstaid/combat												= TRADER_THIS_TYPE,
+								/obj/item/storage/firstaid/surgery												= TRADER_THIS_TYPE,
+								/obj/item/storage/backpack/dufflebag/syndie/med/full							= TRADER_THIS_TYPE
 								)
diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm
@@ -233,23 +233,29 @@
 /datum/trader/ship/kaboom
 	name = "Unknown Primitive Signature"
 	origin = "Kadaab Deserts"
-	speech = list(TRADER_HAIL_GENERIC    = "Ka-boom? Funny paper give you, we give you ka-boom.",
-				TRADER_HAIL_DENY         = "No ka-boom for space demons.",
+	trade_flags = TRADER_MONEY|TRADER_GOODS|TRADER_WANTED_ONLY|TRADER_WANTED_ALL
+	want_multiplier = 1
+	speech = list(TRADER_HAIL_GENERIC		= "Ka-boom? Funny paper give you, we give you ka-boom.",
+				TRADER_HAIL_DENY			= "No ka-boom for space demons.",
 
-				TRADER_TRADE_COMPLETE    = "Make more kaboom with ka-boom.",
-				TRADER_NO_BLACKLISTED   = "Not funny and not kaboom.",
-				TRADER_NO_GOODS    = "Where funny paper.",
-				TRADER_NOT_ENOUGH  = "More paper!!",
-				TRADER_HOW_MUCH          = "Orgh... One, two... VALUE.",
+				TRADER_TRADE_COMPLETE		= "Make more kaboom with ka-boom.",
+				TRADER_FOUND_UNWANTED		= "This not funny and not meal - we not need.",
+				TRADER_WHAT_WANT			= "Ohm, we want eat meal. And drink wata. We not drink wata for... Orgh, many suns.",
+				TRADER_NOT_ENOUGH			= "More paper!!",
+				TRADER_HOW_MUCH				= "Orgh... One, two... VALUE.",
 
-				TRADER_COMPLEMENT_FAILURE   = "You stoopid.",
-				TRADER_COMPLEMENT_SUCCESS = "Great ka-boom!",
-				TRADER_INSULT_GOOD       = "My ka-boom is good, you bad space demon!!!",
-				TRADER_INSULT_BAD        = "Erght... What?"
+				TRADER_COMPLEMENT_FAILURE	= "You stoopid.",
+				TRADER_COMPLEMENT_SUCCESS	= "Great ka-boom!",
+				TRADER_INSULT_GOOD			= "My ka-boom is good, you bad space demon!!!",
+				TRADER_INSULT_BAD			= "Erght... What?"
 	)
 	compliment_increase = 5
 	insult_drop = 5
 
+	wanted_items  = list(
+						/obj/item/reagent_containers/food								= TRADER_ALL
+						)
+
 	possible_trading_items = list(
 								/obj/item/gun/launcher/grenade							= TRADER_THIS_TYPE,
 								/obj/item/gun/projectile/rocket/oneuse					= TRADER_THIS_TYPE,