Skip to content

Commit

Permalink
Adds a few items to the ranger. (#2675)
Browse files Browse the repository at this point in the history
## About The Pull Request
Adds two flashes, a Recharger, a stamp and a wideband to the Ranger
bridge. And a commander pistol,mags and ammo to the lieutenant closet
and security closet,and adds a 9mm ammo disk for the autolathe. Also
removes the ORM due to latency's request.


## Why It's Good For The Game
It lets the captain recharge their e-rifle, complete the cyborg shell,
stamp paperwork and actually talk to people for once.
The commanders are to give a bit more firepower,as before the security
specialist had only one derringer (!!) and i feel like the lieutenant
could do with a bit more firepower,too.
The ORM was removed due to having refineries in outposts.
## Changelog

:cl:
add: Added two flashes, a recharger, a stamp, two commanders, ammo for
them and a wideband to the Ranger bridge.
del: The Ranger's ORM.
/:cl:
  • Loading branch information
Martinpachu authored Feb 3, 2024
1 parent ba4ec84 commit 8df3f1d
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 13 deletions.
46 changes: 33 additions & 13 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,15 @@
/obj/item/clothing/suit/armor/vest/security,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/gps,
/obj/item/gun/ballistic/derringer,
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/structure/railing{
dir = 4
},
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c38_box,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/storage/belt/security/webbing,
/turf/open/floor/wood,
/area/ship/security)
"bD" = (
Expand Down Expand Up @@ -961,12 +964,10 @@
/turf/open/floor/plasteel/white,
/area/ship/hallway/starboard)
"iX" = (
/obj/machinery/mineral/ore_redemption{
dir = 8
},
/obj/effect/turf_decal/siding/yellow{
dir = 10
},
/obj/structure/ore_box,
/turf/open/floor/plasteel/dark,
/area/ship/hallway/port)
"iZ" = (
Expand Down Expand Up @@ -3132,6 +3133,12 @@
pixel_x = 7;
pixel_y = -20
},
/obj/item/gun/ballistic/automatic/pistol/commander,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm,
/obj/item/ammo_box/c9mm/rubbershot,
/obj/item/ammo_box/magazine/co9mm,
/obj/item/ammo_box/magazine/co9mm,
/turf/open/floor/wood,
/area/ship/crew/dorm)
"Hd" = (
Expand Down Expand Up @@ -3650,6 +3657,10 @@
},
/turf/open/floor/plasteel/tech,
/area/ship/engineering)
"MD" = (
/obj/item/disk/design_disk/ammo_c9mm,
/turf/open/floor/plating,
/area/ship/engineering)
"MI" = (
/obj/machinery/airalarm/directional/north,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
Expand Down Expand Up @@ -3985,6 +3996,9 @@
/obj/item/robot_suit,
/obj/structure/closet/crate/engineering,
/obj/effect/turf_decal/industrial/hatch/orange,
/obj/item/stock_parts/cell/high,
/obj/item/assembly/flash/handheld,
/obj/item/assembly/flash/handheld,
/turf/open/floor/plating,
/area/ship/engineering)
"Qu" = (
Expand Down Expand Up @@ -4181,8 +4195,15 @@
pixel_x = 5
},
/obj/item/pen/fountain{
pixel_x = -4;
pixel_y = 7
},
/obj/machinery/recharger{
pixel_x = -4
},
/obj/item/stamp/captain{
pixel_x = 7
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"Ur" = (
Expand Down Expand Up @@ -4401,10 +4422,9 @@
/turf/open/floor/plasteel/dark,
/area/ship/hallway/central)
"WF" = (
/obj/structure/ore_box,
/obj/machinery/light/dim/directional/west,
/turf/open/floor/engine/hull,
/area/ship/external)
/obj/item/radio/intercom/wideband,
/turf/closed/wall/r_wall,
/area/ship/bridge)
"WG" = (
/obj/machinery/telecomms/server/presets/nanotrasen{
autolinkers = list("nanotrasen","hub");
Expand Down Expand Up @@ -5158,7 +5178,7 @@ jA
zW
Tz
LQ
aP
MD
aP
xq
Wp
Expand Down Expand Up @@ -5517,7 +5537,7 @@ gg
zW
zW
zW
WF
QV
jA
KQ
wp
Expand Down Expand Up @@ -5941,7 +5961,7 @@ Lk
mn
cv
lW
Lk
WF
VQ
zW
zW
Expand Down
8 changes: 8 additions & 0 deletions code/modules/research/designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,3 +166,11 @@ other types of metals and chemistry for reagents).
. = ..()
blueprints[1] = new /datum/design/cmm_ripley_upgrade()
blueprints[2] = new /datum/design/cmm_durand_upgrade()

/obj/item/disk/design_disk/ammo_c9mm
name = "Design Disk - 9mm Ammo"
desc = "A design disk containing the pattern for a refill box of standard 9mm ammo, used in Commander pistols."

/obj/item/disk/design_disk/ammo_c9mm/Initialize()
. = ..()
blueprints[1] = new /datum/design/c9mmautolathe()
8 changes: 8 additions & 0 deletions code/modules/research/designs/weapon_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -787,3 +787,11 @@
build_path = /obj/item/gun/ballistic/rifle/boltaction
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_BALLISTICS

/datum/design/c9mmautolathe
name = "Ammo Box (9mm)"
id = "c9mmautolathe"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 15000)
build_path = /obj/item/ammo_box/c9mm
category = list("Imported")

0 comments on commit 8df3f1d

Please sign in to comment.