From 4c02f20812c961d291b3bd9ba889dce64da59f90 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 14 Nov 2019 15:44:59 -0700
Subject: [PATCH 1/2] reorganizing

---
 code/modules/projectiles/ammunition/ballistic/revolver.dm | 2 +-
 code/modules/projectiles/boxes_magazines/ammo_boxes.dm    | 2 +-
 code/modules/projectiles/projectile/bullets/revolver.dm   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm
index d5a9fab4..7bc52043 100644
--- a/code/modules/projectiles/ammunition/ballistic/revolver.dm
+++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm
@@ -47,4 +47,4 @@
 	name = ".38 Iceblox bullet casing"
 	desc = "A .38 Iceblox bullet casing."
 	caliber = "38"
-	projectile_type = /obj/item/projectile/bullet/c38/iceblox
\ No newline at end of file
+	projectile_type = /obj/item/projectile/bullet/c38/iceblox
diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
index b0e699a4..138a67f1 100644
--- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
+++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -90,4 +90,4 @@
 /obj/item/ammo_box/foambox/riot
 	icon_state = "foambox_riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-	materials = list(MAT_METAL = 50000)
\ No newline at end of file
+	materials = list(MAT_METAL = 50000)
diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm
index 8ba2ba97..fb669fe3 100644
--- a/code/modules/projectiles/projectile/bullets/revolver.dm
+++ b/code/modules/projectiles/projectile/bullets/revolver.dm
@@ -13,12 +13,11 @@
 // .38 (Detective's Gun)
 
 /obj/item/projectile/bullet/c38
-	name = ".38 rubber bullet"
+	name = ".38 bullet"
 	damage = 25
-	stamina = 48
 
 /obj/item/projectile/bullet/c38/rubber
-	name = ".38 bullet"
+	name = ".38 rubber bullet"
 	damage = 15
 	stamina = 48
 
@@ -59,6 +58,7 @@
 		var/mob/living/M = target
 		M.adjust_bodytemperature(((100-blocked)/100)*(temperature - M.bodytemperature))
 
+
 // .357 (Syndie Revolver)
 
 /obj/item/projectile/bullet/a357
@@ -68,4 +68,4 @@
 /obj/item/projectile/bullet/a357/ap
 	name = ".357 armor-piercing bullet"
 	damage = 45
-	armour_penetration = 45
\ No newline at end of file
+	armour_penetration = 45

From 3637fb2c1b4607c14a69790e7a83037e23e17c39 Mon Sep 17 00:00:00 2001
From: BlackMajor <henrydyer6@hotmail.com>
Date: Tue, 10 Dec 2019 11:16:59 +1300
Subject: [PATCH 2/2] Merge pull request #10082 from
 Citadel-Station-13/kevinz000-patch-122

Bluespace launchpad QoL (read: powercreep)
---
 .../game/machinery/computer/launchpad_control.dm | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm
index d1f45001..b5d393bc 100644
--- a/code/game/machinery/computer/launchpad_control.dm
+++ b/code/game/machinery/computer/launchpad_control.dm
@@ -74,8 +74,8 @@
 			t += "<A href='?src=[REF(src)];lowery=1;raisex=1;pad=[current_pad]'>O</A><BR>"//down-right
 			t += "<BR>"
 			t += "<div class='statusDisplay'>Current offset:</div><BR>"
-			t += "<div class='statusDisplay'>[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"]</div><BR>"
-			t += "<div class='statusDisplay'>[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"]</div><BR>"
+			t += "<div class='statusDisplay'>[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"] <a href='?src=[REF(src)];sety=1;pad=[current_pad]'>\[SET\]</a></div><BR>"
+			t += "<div class='statusDisplay'>[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"] <a href='?src=[REF(src)];setx=1;pad=[current_pad]'>\[SET\]</a></div><BR>"
 
 			t += "<BR><A href='?src=[REF(src)];launch=1;pad=[current_pad]'>Launch</A>"
 			t += " <A href='?src=[REF(src)];pull=1;pad=[current_pad]'>Pull</A>"
@@ -132,6 +132,16 @@
 		if(!new_name)
 			return
 		pad.display_name = new_name
+	
+	if(href_list["setx"])
+		var/newx = input(usr, "Input new x offset", pad.display_name, pad.x_offset) as null|num
+		if(!isnull(newx))
+			pad.x_offset = CLAMP(newx, -pad.range, pad.range)
+
+	if(href_list["sety"])
+		var/newy = input(usr, "Input new y offset", pad.display_name, pad.y_offset) as null|num
+		if(!isnull(newy))
+			pad.y_offset = CLAMP(newy, -pad.range, pad.range)
 
 	if(href_list["remove"])
 		if(usr && alert(usr, "Are you sure?", "Remove Launchpad", "I'm Sure", "Abort") != "Abort")
@@ -145,4 +155,4 @@
 		sending = FALSE
 		teleport(usr, pad)
 
-	updateDialog()
\ No newline at end of file
+	updateDialog()