From d1b2a9cc61cf85e08e6aee32168dc02a6b3ceca6 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Thu, 12 Sep 2024 16:51:32 +0200 Subject: [PATCH] should fix it all? --- .../syndicate/syndicate_cybersun_kansatsu.dmm | 13 +++++++++++-- code/game/objects/items/storage/guncases.dm | 4 ++-- code/game/objects/items/storage/secure.dm | 8 ++++---- .../projectiles/boxes_magazines/external/pistol.dm | 14 -------------- .../guns/manufacturer/scarborough/ballistics.dm | 3 +++ 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm index 8f58fd935e06..14b0f87f61dd 100644 --- a/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm +++ b/_maps/shuttles/syndicate/syndicate_cybersun_kansatsu.dmm @@ -655,6 +655,7 @@ /obj/item/clothing/gloves/combat, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/head/HoS/cybersun, +/obj/item/pen/edagger, /turf/open/floor/plasteel/patterned/brushed, /area/ship/bridge) "lP" = ( @@ -1327,7 +1328,11 @@ /obj/structure/cable/orange{ icon_state = "0-2" }, -/turf/open/floor/carpet/nanoweave/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm/dormtwo) "uq" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2622,7 +2627,11 @@ /obj/effect/spawner/lootdrop/plushie{ pixel_y = 6 }, -/turf/open/floor/carpet/nanoweave/red, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered{ + dir = 1 + }, +/obj/effect/turf_decal/spline/fancy/opaque/syndiered, +/turf/open/floor/plasteel/patterned/brushed, /area/ship/crew/dorm/dormtwo) "Xw" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, diff --git a/code/game/objects/items/storage/guncases.dm b/code/game/objects/items/storage/guncases.dm index da536daa33db..301d0f605364 100644 --- a/code/game/objects/items/storage/guncases.dm +++ b/code/game/objects/items/storage/guncases.dm @@ -138,8 +138,8 @@ /obj/item/storage/pistolcase/himehabu /obj/item/storage/pistolcase/himehabu/PopulateContents() new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src) - new /obj/item/ammo_box/magazine/m22lr/empty(src) - new /obj/item/ammo_box/magazine/m22lr/empty(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu/empty(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu/empty(src) /obj/item/storage/pistolcase/candor /obj/item/storage/pistolcase/candor/PopulateContents() diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 5591b49c899a..b7347ddf28cc 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -207,7 +207,7 @@ name = "Captain's secure safe" /obj/item/storage/secure/safe/cybersun/PopulateContents() - new /obj/item/gun/ballistic/revolver/syndicate/no_mag(src) - new /obj/item/ammo_box/a357 (src) - new /obj/item/ammo_box/a357 (src) - new /obj/item/folder/documents/syndicate/cybersun (src) + new /obj/item/gun/ballistic/automatic/pistol/himehabu/no_mag(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu(src) + new /obj/item/ammo_box/magazine/m22lr_himehabu(src) + new /obj/item/folder/documents/syndicate/cybersun(src) diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 9df554a1af21..90d2c7e4546e 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -122,17 +122,3 @@ caliber = "9mm" max_ammo = 4 custom_materials = list(/datum/material/iron = 20000) - -/obj/item/ammo_box/magazine/m22lr - name = "pistol magazine (.22 LR)" - desc = "A single-stack handgun magazine designed to chamber .22 LR. It's rather tiny, all things considered." - icon_state = "himehabu_mag-10" - base_icon_state = "himehabu_mag" - ammo_type = /obj/item/ammo_casing/c22lr - caliber = "22lr" - max_ammo = 10 - w_class = WEIGHT_CLASS_TINY - multiple_sprites = AMMO_BOX_PER_BULLET - -/obj/item/ammo_box/magazine/m22lr/empty - start_empty = TRUE diff --git a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm index 18239e94dd7e..19729a7a0337 100644 --- a/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm +++ b/code/modules/projectiles/guns/manufacturer/scarborough/ballistics.dm @@ -358,6 +358,9 @@ EMPTY_GUN_HELPER(automatic/pistol/himehabu) w_class = WEIGHT_CLASS_TINY multiple_sprites = AMMO_BOX_PER_BULLET +/obj/item/ammo_box/magazine/m22lr_himehabu/empty + start_empty = TRUE + //########### SMGS ###########//