Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AmoryBlaine committed Sep 23, 2024
1 parent 5597a2a commit 723ddb3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
4 changes: 4 additions & 0 deletions code/modules/projectiles/magazines/shotguns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,18 +164,22 @@ also doesn't really matter. You can only reload them with handfuls.

/obj/item/ammo_magazine/internal/shotgun/double //For a double barrel.
max_rounds = 2
current_rounds = 0
chamber_closed = 1 //Starts out with a closed tube.

/obj/item/ammo_magazine/internal/shotgun/double/cane
default_ammo = /datum/ammo/bullet/revolver/marksman
max_rounds = 6
current_rounds = 6
caliber = ".44"
/obj/item/ammo_magazine/internal/shotgun/double/mou53
default_ammo = /datum/ammo/bullet/shotgun/flechette
max_rounds = 3

/obj/item/ammo_magazine/internal/shotgun/double/twobore //Van Bandolier's superheavy double-barreled hunting rifle.
caliber = "2 bore"
max_rounds = 2
current_rounds = 0
default_ammo = /datum/ammo/bullet/shotgun/twobore

/obj/item/ammo_magazine/internal/shotgun/combat
Expand Down
2 changes: 1 addition & 1 deletion maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10474,7 +10474,7 @@
/area/strata/ag/interior/administration)
"cfX" = (
/obj/structure/largecrate/random,
/obj/item/storage/belt/marine/upp/sapper,
/obj/item/storage/belt/marine/upp/full,
/turf/open/asphalt/cement,
/area/strata/ag/exterior/research_decks)
"cfZ" = (
Expand Down
25 changes: 18 additions & 7 deletions maps/shuttles/dropship_upp.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,15 @@
},
/area/shuttle/ds_upp)
"CV" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
pixel_x = 30
},
/obj/structure/barricade/handrail/strata{
dir = 4;
can_buckle = 1
},
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
name = "\improper MinZdrav dispenser";
desc = "A wall-mounted medical equipment dispenser. Provided by Ministry of Health of UPP, it contains a small quantity of emergency supplies.";
pixel_x = 30
},
/turf/open/floor/plating/plating_catwalk/strata,
/area/shuttle/ds_upp)
"DG" = (
Expand All @@ -261,6 +263,13 @@
opacity = 0
},
/area/shuttle/ds_upp)
"Ek" = (
/obj/effect/attach_point/crew_weapon/midway{
attach_id = 7;
ship_tag = "dropship_upp"
},
/turf/open/floor/strata/multi_tiles/southwest,
/area/shuttle/ds_upp)
"Fc" = (
/obj/structure/barricade/handrail/strata{
dir = 4;
Expand Down Expand Up @@ -569,13 +578,15 @@
/turf/open/floor/strata/floor3/east,
/area/shuttle/ds_upp)
"YJ" = (
/obj/structure/machinery/cm_vending/sorted/medical/wall_med{
pixel_x = -30
},
/obj/structure/barricade/handrail/strata{
dir = 8;
can_buckle = 1
},
/obj/structure/machinery/cm_vending/sorted/medical/wall_med/limited{
name = "\improper MinZdrav dispenser";
desc = "A wall-mounted medical equipment dispenser. Provided by Ministry of Health of UPP, it contains a small quantity of emergency supplies.";
pixel_x = -30
},
/turf/open/floor/plating/plating_catwalk/strata,
/area/shuttle/ds_upp)
"Zh" = (
Expand Down Expand Up @@ -701,7 +712,7 @@ Nh
Sn
Ab
cS
Th
Ek
Th
Th
Yn
Expand Down

0 comments on commit 723ddb3

Please sign in to comment.