Fixes

Yawn-Wider · Aug 28, 2024 · dd5a202 · dd5a202
1 parent 42b345b
commit dd5a202
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 108 deletions.
diff --git a/code/datums/supplypacks/contraband.dm b/code/datums/supplypacks/contraband.dm
@@ -101,7 +101,7 @@
 /datum/supply_pack/supply/stolen
 	name = "Stolen supply crate"
 	contains = list(/obj/item/stolenpackage = 1)
-	cost = 150
+	cost = 1000 // YW Edit
 	containertype = /obj/structure/closet/crate
 	containername = "Stolen crate"
 	contraband = 1

diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -117,7 +117,7 @@
 	display_name = "Optical Meson Scanners selection"
 	description = "Select from a range of meson-projection eyewear. Note: not all of these items are atmospherically sealed."
 	path = /obj/item/clothing/glasses/meson
-	allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director")
+	allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder", "Field Medic") // YW EDIT Field medic, Explo
 
 /datum/gear/eyes/meson/New()
 	..()

diff --git a/code/modules/client/preference_setup/loadout/loadout_shoes.dm b/code/modules/client/preference_setup/loadout/loadout_shoes.dm
@@ -228,7 +228,7 @@
 /datum/gear/shoes/boots/winter/medical
 	display_name = "medical winter boots"
 	path = /obj/item/clothing/shoes/boots/winter/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist")
+	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") // YW EDIT Field medic
 
 /datum/gear/shoes/boots/winter/mining
 	display_name = "mining winter boots"

diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm
@@ -200,7 +200,7 @@
 	if(is_train_head())
 		if(direction == reverse_direction(dir) && tow)
 			return 0
-		if(vehicle_move(get_step(src, direction))) // YW Edit - pr #1294
+		if(Move(get_step(src, direction))) // YW Edit - pr #1294
 			return 1
 		return 0
 	else

diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm
@@ -129,7 +129,7 @@
 /obj/vehicle/bike/relaymove(mob/user, direction)
 	if(user != load || !on)
 		return 0
-	if(vehicle_move(get_step(src, direction))) // YW Edit - pr #1294
+	if(Move(get_step(src, direction)))
 		return 1
 	return 0
 

diff --git a/code/modules/vehicles/cargo_train.dm b/code/modules/vehicles/cargo_train.dm
@@ -189,7 +189,7 @@
 	if(is_train_head())
 		if(direction == reverse_direction(dir) && tow)
 			return 0
-		if(vehicle_move(get_step(src, direction))) // YW Edit - pr #1294
+		if(Move(get_step(src, direction))) // YW Edit - pr #1294
 			return 1
 		return 0
 	else

diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
@@ -92,13 +92,6 @@
 	if(load && !(load in buckled_mobs) && !istype(load, /datum/vehicle_dummy_load))
 		load.forceMove(loc)
 
-//YW ADDITION: start - pr #1294
-/obj/vehicle/Move(var/newloc, var/direction, var/movetime)
-	// NOTICE - do not put checks here, put them in vehicle_move() otherwise you will break falling and other forced movements!
-	// as well, vehicles should call vehicle_move() instead, so they do their checks...
-	. = ..()
-//YW ADDITION: end
-
 /obj/vehicle/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/hand_labeler))
 		return

diff --git a/tgui/public/tgui.bundle.js b/tgui/public/tgui.bundle.js