Merge pull request #15697 from VOREStation/master

1/21/24 - Map swap

Author: Very-Soft

code/__defines/chemistry.dm

@@ -49,7 +49,7 @@
 // Chemistry lists.
 var/list/tachycardics  = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
 var/list/bradycardics  = list("neurotoxin", "cryoxadone", "clonexadone", "bliss", "stoxin", "ambrosia_extract")   // Decrease heart rate.
-var/list/heartstopper  = list("potassium_chlorophoride", "zombie_powder") // This stops the heart.
+var/list/heartstopper  = list("potassium_chlorophoride", "zombiepowder") // This stops the heart.
 var/list/cheartstopper = list("potassium_chloride")                       // This stops the heart when overdose is met. -- c = conditional
 
 #define MAX_PILL_SPRITE 24 //max icon state of the pill sprites

code/_onclick/hud/robot.dm

@@ -240,7 +240,8 @@ var/obj/screen/robot_inventory
 
 		var/display_rows = -round(-(r.module.modules.len) / 8)
 		r.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7"
-		r.client.screen += r.robot_modules_background
+		if(r.client)
+			r.client.screen += r.robot_modules_background
 
 		var/x = -4	//Start at CENTER-4,SOUTH+1
 		var/y = 1
@@ -258,7 +259,7 @@ var/obj/screen/robot_inventory
 					r.module.modules.Remove(r.module.emag)
 
 		for(var/atom/movable/A in r.module.modules)
-			if( (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
+			if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
 				//Module is not currently active
 				r.client.screen += A
 				if(x < 0)
@@ -276,11 +277,12 @@ var/obj/screen/robot_inventory
 		//Modules display is hidden
 		//r.client.screen -= robot_inventory	//"store" icon
 		for(var/atom/A in r.module.modules)
-			if( (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
+			if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
 				//Module is not currently active
 				r.client.screen -= A
 		r.shown_robot_modules = 0
-		r.client.screen -= r.robot_modules_background
+		if(r.client)
+			r.client.screen -= r.robot_modules_background
 
 /mob/living/silicon/robot/update_hud()
 	if(modtype)

code/game/antagonist/station/highlander.dm

@@ -12,6 +12,8 @@ var/datum/antagonist/highlander/highlanders
 	initial_spawn_req = 3
 	initial_spawn_target = 5
 
+	id_type = /obj/item/weapon/card/id/centcom/ERT
+
 /datum/antagonist/highlander/New()
 	..()
 	highlanders = src
@@ -32,26 +34,28 @@ var/datum/antagonist/highlander/highlanders
 	if(!..())
 		return
 
-	for (var/obj/item/I in player)
-		if (istype(I, /obj/item/weapon/implant))
-			continue
-		qdel(I)
-
+	// drop original items! It used to be a loop that just Qdeled everything including your organs!
+	// Dropping because of non-oxy breathers... That would suck wouldn't it?
+	player.drop_from_inventory(player.get_equipped_item(slot_wear_id))
+	player.drop_from_inventory(player.get_equipped_item(slot_wear_suit))
+	player.drop_from_inventory(player.get_equipped_item(slot_w_uniform))
+	player.drop_from_inventory(player.get_equipped_item(slot_l_ear))
+	player.drop_from_inventory(player.get_equipped_item(slot_head))
+	player.drop_from_inventory(player.get_equipped_item(slot_l_hand))
+	player.drop_from_inventory(player.get_equipped_item(slot_shoes))
+	player.drop_from_inventory(player.get_equipped_item(slot_l_store))
+	// highlanders!
 	player.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(player), slot_w_uniform)
-	player.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(player), slot_l_ear)
 	player.equip_to_slot_or_del(new /obj/item/clothing/head/beret(player), slot_head)
 	player.equip_to_slot_or_del(new /obj/item/weapon/material/sword(player), slot_l_hand)
 	player.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/combat(player), slot_shoes)
 	player.equip_to_slot_or_del(new /obj/item/weapon/pinpointer(get_turf(player)), slot_l_store)
 
-	var/obj/item/weapon/card/id/W = new(player)
-	W.name = "[player.real_name]'s ID Card"
-	W.icon_state = "centcom"
-	W.access = get_all_station_access().Copy()
-	W.access |= get_all_centcom_access()
-	W.assignment = "Highlander"
-	W.registered_name = player.real_name
-	player.equip_to_slot_or_del(W, slot_wear_id)
+	var/obj/item/weapon/card/id/id = create_id("Highlander", player)
+	if(id)
+		id.access |= get_all_station_access()
+		id.icon_state = "centcom"
+	create_radio(DTH_FREQ, player)
 
 /proc/only_one()
 

code/game/objects/items/weapons/material/material_weapons.dm

@@ -140,7 +140,7 @@
 		return
 
 /obj/item/weapon/material/proc/sharpen(var/material, var/sharpen_time, var/kit, mob/living/M)
-	if(!fragile)
+	if(!fragile && src.material.can_sharpen)
 		if(health < initial(health))
 			to_chat(M, "You should repair [src] first. Try using [kit] on it.")
 			return FALSE

code/game/objects/items/weapons/storage/laundry_basket.dm

@@ -65,7 +65,8 @@
 		return ..()
 
 /obj/item/weapon/storage/laundry_basket/dropped(mob/user as mob)
-	QDEL_NULL(linked)
+	if(linked)
+		QDEL_NULL(linked)
 	return ..()
 
 /obj/item/weapon/storage/laundry_basket/show_to(mob/user as mob)
@@ -82,6 +83,6 @@
 	use_to_pickup = FALSE
 
 /obj/item/weapon/storage/laundry_basket/offhand/dropped(mob/user as mob)
-	user.drop_from_inventory(linked)
+	if(user.isEquipped(linked))
+		user.drop_from_inventory(linked)
 	return
-

code/game/turfs/flooring/flooring.dm

@@ -198,6 +198,17 @@ var/list/flooring_types
 		'sound/effects/footstep/mud3.ogg',
 		'sound/effects/footstep/mud4.ogg'))
 
+/decl/flooring/rock
+	name = "rocks"
+	desc = "Hard as a rock."
+	icon = 'icons/turf/outdoors.dmi'
+	icon_base = "rock"
+	footstep_sounds = list("human" = list(
+		'sound/effects/footstep/LightStone1.ogg',
+		'sound/effects/footstep/LightStone2.ogg',
+		'sound/effects/footstep/LightStone3.ogg',
+		'sound/effects/footstep/LightStone4.ogg'))
+
 /decl/flooring/asteroid
 	name = "coarse sand"
 	desc = "You got a pebble in your shoe just looking at it."

code/game/turfs/simulated/outdoors/outdoors.dm

@@ -123,6 +123,7 @@ var/list/turf_edge_cache = list()
 	desc = "Hard as a rock."
 	icon_state = "rock"
 	edge_blending_priority = 1
+	initial_flooring = /decl/flooring/rock
 
 /turf/simulated/floor/outdoors/rocks/caves
 	outdoors = OUTDOORS_NO
@@ -185,4 +186,4 @@ var/list/turf_edge_cache = list()
 	icon = 'icons/turf/concrete.dmi'
 	icon_state = "concrete_dark"
 	desc = "Some sort of material composite road."
-	edge_blending_priority = -1
+	edge_blending_priority = -1

code/game/turfs/simulated/underwater.dm

@@ -71,9 +71,9 @@
 	water_state = "cult"
 
 /turf/simulated/floor/water/underwater/ruins
-	icon = 'maps/atoll/icons/turfs/marble.dmi'
+	icon = 'maps/redgate/falls/icons/turfs/marble.dmi'
 	icon_state = "1" // So it shows up in the map editor as water.
-	water_icon = 'maps/atoll/icons/turfs/marble.dmi'
+	water_icon = 'maps/redgate/falls/icons/turfs/marble.dmi'
 	water_state = "1"
 
 /turf/simulated/floor/water/underwater/sand

code/game/turfs/simulated/water.dm

@@ -73,6 +73,27 @@
 			water_breath.adjust_gas(gasid, BREATH_MOLES) // They have no oxygen, but non-zero moles and temp
 			water_breath.temperature = above_air.temperature
 			return water_breath
+	if(L && L.is_bad_swimmer() && depth >= 2 && !L.buckled())
+		if(prob(10))
+			L.visible_message("<span class='notice'>[L] splashes wildly.</span>","<span class='warning'>You struggle to keep your head above the water!</span>")
+		if(L.can_breathe_water())
+			var/datum/gas_mixture/water_breath = new()
+			var/datum/gas_mixture/above_air = return_air()
+			var/amount = 300
+			water_breath.adjust_gas("oxygen", amount) // Assuming water breathes just extract the oxygen directly from the water.
+			water_breath.temperature = above_air.temperature
+			return water_breath
+		else
+			var/gasid = "carbon_dioxide"
+			if(ishuman(L))
+				var/mob/living/carbon/human/H = L
+				if(H.species && H.species.exhale_type)
+					gasid = H.species.exhale_type
+			var/datum/gas_mixture/water_breath = new()
+			var/datum/gas_mixture/above_air = return_air()
+			water_breath.adjust_gas(gasid, BREATH_MOLES) // They have no oxygen, but non-zero moles and temp
+			water_breath.temperature = above_air.temperature
+			return water_breath
 	return return_air() // Otherwise their head is above the water, so get the air from the atmosphere instead.
 
 /turf/simulated/floor/water/Entered(atom/movable/AM, atom/oldloc)
@@ -125,6 +146,14 @@
 		return species.can_breathe_water()
 	return ..()
 
+/mob/living/proc/is_bad_swimmer()
+	return FALSE
+
+/mob/living/carbon/human/is_bad_swimmer()
+	if(species)
+		return species.is_bad_swimmer()
+	return ..()
+
 /mob/living/proc/check_submerged()
 	if(buckled)
 		return 0

code/modules/admin/verbs/modify_robot.dm

@@ -3,7 +3,7 @@
 	set name = "Modify Robot Module"
 	set desc = "Allows to add or remove modules to/from robots."
 	set category = "Admin"
-	if(!check_rights(R_ADMIN))
+	if(!check_rights(R_ADMIN, R_FUN, R_VAREDIT))
 		return
 
 	if(!istype(target) || !target.module)

code/modules/admin/verbs/resize.dm

@@ -2,9 +2,9 @@
     set name = "Resize"
     set desc = "Resizes any living mob without any restrictions on size."
     set category = "Fun"
-    if(!check_rights(R_ADMIN, R_FUN))
+    if(!check_rights(R_ADMIN, R_FUN, R_VAREDIT))
         return
-    
+
     var/size_multiplier = tgui_input_number(usr, "Input size multiplier.", "Resize", 1)
     if(!size_multiplier)
         return //cancelled
@@ -21,4 +21,4 @@
     L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE)
 
     log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].")
-    feedback_add_details("admin_verb","RESIZE")
+    feedback_add_details("admin_verb","RESIZE")

code/modules/client/preference_setup/loadout/loadout_suit.dm

@@ -505,6 +505,10 @@
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic
 // winter coats end here
 
+/datum/gear/suit/runner
+	display_name = "runner jacket"
+	path = /obj/item/clothing/suit/runner
+
 /datum/gear/suit/varsity
 	display_name = "varsity jacket selection"
 	path = /obj/item/clothing/suit/varsity

code/modules/client/preference_setup/loadout/loadout_uniform.dm

@@ -374,6 +374,10 @@
 	display_name = "halter top"
 	path = /obj/item/clothing/under/haltertop
 
+/datum/gear/uniform/tanktop
+	display_name = "tank top"
+	path = /obj/item/clothing/under/tanktop
+
 /datum/gear/uniform/revealingdress
 	display_name = "revealing dress"
 	path = /obj/item/clothing/under/dress/revealingdress

code/modules/clothing/suits/miscellaneous.dm

@@ -799,6 +799,14 @@
 	name = "brown varsity jacket"
 	icon_state = "varsity_brown"
 
+/obj/item/clothing/suit/runner
+	name = "runner jacket"
+	desc = "A yellow sports jacket with white trim and an unfolded collar."
+	icon_state = "runner"
+	allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
+	item_state_slots = list(slot_r_hand_str = "suit_red", slot_l_hand_str = "suit_red")
+	flags_inv = HIDEHOLSTER
+
 /*
  * Department Jackets
  */

code/modules/clothing/under/miscellaneous.dm

@@ -981,6 +981,11 @@
 	desc = "Jean shorts and a black halter top. Perfect for casual Fridays!"
 	icon_state = "haltertop"
 
+/obj/item/clothing/under/tanktop
+	name = "tank top"
+	desc = "The most versatile top ever created."
+	icon_state = "tanktop"
+
 /obj/item/clothing/under/rippedpunk
 	name = "ripped punk jeans"
 	desc = "Black ripped jeans and a fishnet top. How punk."

code/modules/lore_codex/codex.dm

@@ -9,13 +9,21 @@
 	var/datum/codex_tree/tree = null
 	var/root_type = /datum/lore/codex/category/main_virgo_lore	//Runtimes on codex_tree.dm, line 18 with a null here
 
+	var/static/list/codex_tree_keys = list() // static list linking codexes to the correct codex_tree.
+
 /obj/item/weapon/book/codex/Initialize()
-	tree = new(src, root_type)
+	tree = codex_tree_keys["[root_type]"]
+	if(!tree)
+		tree = new(src, root_type)
+		codex_tree_keys["[root_type]"] = tree
 	. = ..()
 
 /obj/item/weapon/book/codex/attack_self(mob/user)
 	if(!tree)
-		tree = new(src, root_type)
+		tree = codex_tree_keys["[root_type]"]
+		if(!tree)
+			tree = new(src, root_type)
+			codex_tree_keys["[root_type]"] = tree
 	icon_state = "[initial(icon_state)]-open"
 	tree.display(user)