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 += "O
"//down-right t += "
" t += "
Current offset:

" - t += "
[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"]

" - t += "
[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"]

" + t += "
[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"] \[SET\]

" + t += "
[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"] \[SET\]

" t += "
Launch" t += " Pull" @@ -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() 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