Skip to content

Commit

Permalink
map updates, random m79 wood resprite
Browse files Browse the repository at this point in the history
- map updates
- M79 resprited and had its preload removed
  • Loading branch information
AmoryBlaine committed Jul 1, 2024
1 parent f953cfb commit c05d2fc
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 32 deletions.
2 changes: 1 addition & 1 deletion code/modules/cm_marines/equipment/guncases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
storage_slots = 2

/obj/item/storage/box/guncase/shotgun/pump/special/fill_preset_inventory()
new /obj/item/weapon/gun/shotgun/pump/special(src)
new /obj/item/weapon/gun/shotgun/pump(src)
new /obj/item/ammo_magazine/shotgun/buckshot/special(src)

/obj/item/storage/box/guncase/mk45_automag
Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/guns/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1192,9 +1192,6 @@ can cause issues with ammo types getting mixed up during the burst.

//-------------------------------------------------------

/obj/item/weapon/gun/shotgun/pump/special
current_mag = /obj/item/ammo_magazine/internal/shotgun/special

/obj/item/weapon/gun/shotgun/pump/dual_tube
name = "generic dual-tube pump shotgun"
desc = "A twenty-round pump action shotgun with dual internal tube magazines. You can switch the active internal magazine by toggling the shotgun tube."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@
icon_state = "m79"
item_state = "m79"
flags_equip_slot = SLOT_BACK
preload = /obj/item/explosive/grenade/slug/baton
//preload = /obj/item/explosive/grenade/slug/baton
is_lobbing = TRUE
actions_types = list(/datum/action/item_action/toggle_firing_level)

Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/magazines/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ also doesn't really matter. You can only reload them with handfuls.
/obj/item/ammo_magazine/internal/shotgun/cmb/m3717
max_rounds = 5

/obj/item/ammo_magazine/internal/shotgun/special
default_ammo = /datum/ammo/bullet/shotgun/buckshot/special

//-------------------------------------------------------

/*
Expand Down
Binary file modified icons/mob/humans/onmob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/humans/onmob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/attachments/stock.dmi
Binary file not shown.
Binary file modified icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi
Binary file not shown.
16 changes: 2 additions & 14 deletions maps/map_files/golden_arrow/golden_arrow.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3906,17 +3906,6 @@
},
/turf/open/floor/plating,
/area/golden_arrow/hangar)
"oK" = (
/obj/item/storage/box/guncase/flamer/special{
layer = 3.1;
pixel_y = 10
},
/obj/structure/surface/rack,
/obj/item/storage/box/guncase/pumpshotgun,
/obj/item/ammo_magazine/shotgun/slugs,
/obj/item/attachable/stock,
/turf/open/floor/almayer,
/area/golden_arrow/platoonarmory)
"oM" = (
/obj/structure/filingcabinet{
density = 0;
Expand Down Expand Up @@ -9789,8 +9778,7 @@
pixel_y = 10
},
/obj/structure/surface/rack,
/obj/item/storage/box/guncase/pumpshotgun,
/obj/item/ammo_magazine/shotgun/slugs,
/obj/item/storage/box/guncase/shotguncombat,
/turf/open/floor/almayer,
/area/golden_arrow/platoonarmory)
"LQ" = (
Expand Down Expand Up @@ -24234,7 +24222,7 @@ EG
EG
EG
HZ
oK
LP
NU
pI
Ot
Expand Down
9 changes: 3 additions & 6 deletions maps/map_files/golden_arrow_classic/golden_arrow_classic.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@
/area/golden_arrow/prep_hallway)
"cV" = (
/obj/structure/surface/table/almayer,
/obj/item/storage/box/guncase/pumpshotgun/special,
/obj/item/storage/box/guncase/shotguncombat,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -4989,7 +4989,7 @@
name = "spent snailshot";
layer = 2.7
},
/obj/item/storage/box/guncase/pumpshotgun/special,
/obj/item/storage/box/guncase/shotguncombat,
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down Expand Up @@ -6236,7 +6236,6 @@
"Kp" = (
/obj/structure/largecrate/supply/motiondetectors,
/obj/structure/largecrate/supply/explosives/grenades/less{
icon_state = "case";
pixel_y = 10;
pixel_x = 3
},
Expand Down Expand Up @@ -7126,9 +7125,7 @@
},
/area/golden_arrow/cryo_cells)
"Pm" = (
/obj/structure/largecrate/supply/explosives/grenades/less{
icon_state = "case"
},
/obj/structure/largecrate/supply/explosives/grenades/less,
/obj/structure/largecrate/supply/motiondetectors{
pixel_y = 10
},
Expand Down
10 changes: 6 additions & 4 deletions maps/map_files/rover/rover.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -488,10 +488,12 @@
/obj/structure/machinery/light{
dir = 8
},
/obj/item/weapon/gun/shotgun/pump,
/obj/item/ammo_magazine/shotgun/buckshot,
/obj/item/ammo_magazine/shotgun/slugs,
/obj/item/attachable/stock,
/obj/item/storage/box/guncase/shotgun/pump{
pixel_y = -3
},
/obj/item/storage/box/guncase/shotgun/pump{
pixel_y = 5
},
/turf/open/floor/almayer{
icon_state = "plate"
},
Expand Down

0 comments on commit c05d2fc

Please sign in to comment.