mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-31 09:00:25 +01:00
Tranquilizer Rifle Part 1 - Something lost, something gained. (#19781)
Removes the tranquilizer rifle from the HoS's office, and places it in the RD's office. Along with removing the box of shells from the HoS locker, placing them in the RD's locker. Changes the description of the rifle to move it away from being a 50 cal sniper. Changed the shells to reflect this as well. Expands the RD's office and reshuffles it slightly to make space for the tranquilizer cabinet. Part 2 will be a resprite of the rifle, to be added at a later date. PR will need loremaster approval due to description involving corporate lore.
This commit is contained in:
courierbravo
@@ -49,6 +49,7 @@
|
||||
new /obj/item/device/megaphone/sci(src)
|
||||
new /obj/item/device/taperecorder(src)
|
||||
new /obj/item/sampler(src)
|
||||
new /obj/item/storage/box/tranquilizer(src)
|
||||
|
||||
/// Used for when we want to populate the contents of this locker ourself. Good for away sites
|
||||
/obj/structure/closet/secure_closet/RD/empty
|
||||
|
||||
@@ -126,7 +126,6 @@
|
||||
new /obj/item/device/radio/headset/heads/hos(src)
|
||||
new /obj/item/device/radio/headset/heads/hos/alt(src)
|
||||
new /obj/item/device/megaphone/sec(src)
|
||||
new /obj/item/storage/box/tranquilizer(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud(src)
|
||||
new /obj/item/clothing/glasses/sunglasses/sechud/head(src)
|
||||
new /obj/item/shield/riot/tact(src)
|
||||
|
||||
@@ -237,11 +237,11 @@
|
||||
projectile_type = /obj/projectile/bullet/shotgun/moghes
|
||||
|
||||
/obj/item/ammo_casing/tranq
|
||||
name = "PPS shell"
|
||||
desc = "A .50 cal PPS bullet casing."
|
||||
name = "Plastic-Gas Shell"
|
||||
desc = "A Plastic-Gas Shell (PGS) casing, for air powered weapons."
|
||||
icon_state = "ishell"
|
||||
spent_icon = "ishell-spent"
|
||||
caliber = "PPS"
|
||||
caliber = "PGS"
|
||||
projectile_type = /obj/projectile/bullet/rifle/tranq
|
||||
max_stack = 6
|
||||
|
||||
|
||||
@@ -142,7 +142,10 @@
|
||||
|
||||
/obj/item/gun/projectile/heavysniper/tranq
|
||||
name = "tranquilizer rifle"
|
||||
desc = "A less-than-lethal modification to the PTR-7 anti-materiel rifle, designed to incapacitate rioters. Fires .50 cal PPS shells that deploy a torpor-inducing drug payload."
|
||||
desc = "A scoped tranquilizer dart gun, with a torpor educing payload."
|
||||
desc_extended = "Designed and sold by Zeng-Hu Pharmaceuticals and produced on contract by Zavodskoi's Kumar Arms subsidiary, the rifle has quietly become ubiquitous among xenobiological researchers. \
|
||||
While the weapon platform itself is expensive for a dart gun, users have come to adore it thanks to the benefit of its conditionally cheap ammo. Pricey off the shelf, facilities often pay a fraction \
|
||||
of the cost thanks to rebates and bulk order discounts."
|
||||
icon = 'icons/obj/guns/tranqsniper.dmi'
|
||||
icon_state = "tranqsniper"
|
||||
item_state = "tranqsniper"
|
||||
@@ -150,7 +153,7 @@
|
||||
force = 15
|
||||
slot_flags = SLOT_BACK
|
||||
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 2)
|
||||
caliber = "PPS"
|
||||
caliber = "PGS"
|
||||
recoil = 1
|
||||
suppressed = TRUE
|
||||
can_unsuppress = FALSE
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# - (fixes bugs)
|
||||
# wip
|
||||
# - (work in progress)
|
||||
# qol
|
||||
# - (quality of life)
|
||||
# soundadd
|
||||
# - (adds a sound)
|
||||
# sounddel
|
||||
# - (removes a sound)
|
||||
# rscadd
|
||||
# - (adds a feature)
|
||||
# rscdel
|
||||
# - (removes a feature)
|
||||
# imageadd
|
||||
# - (adds an image or sprite)
|
||||
# imagedel
|
||||
# - (removes an image or sprite)
|
||||
# spellcheck
|
||||
# - (fixes spelling or grammar)
|
||||
# experiment
|
||||
# - (experimental change)
|
||||
# balance
|
||||
# - (balance changes)
|
||||
# code_imp
|
||||
# - (misc internal code change)
|
||||
# refactor
|
||||
# - (refactors code)
|
||||
# config
|
||||
# - (makes a change to the config files)
|
||||
# admin
|
||||
# - (makes changes to administrator tools)
|
||||
# server
|
||||
# - (miscellaneous changes to server)
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: CourierBravo
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
|
||||
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- balance: "Removed the tranquilizer rifle from the HoS's office, placing it in the RD's office instead. Removed the tranquilizer ammo box from the HoS locker, and into the RD's locker."
|
||||
- rscadd: "Reflavored the tranquilizer rifle's description away from being a modified anti material rifle. Also, reflavored its ammo to be Plastic-Gas Shells instead of .50 cal shells."
|
||||
- rscadd: "Expanded the RD's office slightly and shuffled a few things around to allow for the space for the tranquilizer cabinet."
|
||||
+104
-101
@@ -3313,9 +3313,6 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/hallway/secondary)
|
||||
"axv" = (
|
||||
@@ -11434,19 +11431,16 @@
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/hallway/medical/upper)
|
||||
"bGu" = (
|
||||
/obj/structure/closet/secure_closet/RD,
|
||||
/obj/effect/floor_decal/industrial/outline/research,
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/power/apc/north,
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "0-2"
|
||||
},
|
||||
/obj/machinery/firealarm/west,
|
||||
/obj/structure/tranqcabinet{
|
||||
pixel_x = -32
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 9
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"bGv" = (
|
||||
@@ -26310,11 +26304,8 @@
|
||||
/turf/simulated/floor/tiled/dark/full,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"dSd" = (
|
||||
/obj/structure/shuttle_part/scc_space_ship{
|
||||
icon_state = "d3-4"
|
||||
},
|
||||
/turf/simulated/wall/r_wall,
|
||||
/area/maintenance/research_port)
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"dSk" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-8"
|
||||
@@ -30408,7 +30399,9 @@
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/firealarm/east,
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "2-4"
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/hallway/secondary)
|
||||
"exQ" = (
|
||||
@@ -66016,6 +66009,7 @@
|
||||
/obj/machinery/light/floor{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/firealarm/east,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/rnd/hallway/secondary)
|
||||
"jPD" = (
|
||||
@@ -78873,9 +78867,6 @@
|
||||
/obj/machinery/light{
|
||||
dir = 8
|
||||
},
|
||||
/obj/structure/tranqcabinet{
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/carpet,
|
||||
/area/horizon/security/head_of_security)
|
||||
"lLP" = (
|
||||
@@ -80101,13 +80092,13 @@
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/storage/eva)
|
||||
"lUy" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
/obj/structure/platform{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -19;
|
||||
pixel_y = 3;
|
||||
dir = 8
|
||||
/obj/effect/floor_decal/industrial/outline/research,
|
||||
/obj/structure/closet/secure_closet/RD,
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
@@ -90428,12 +90419,6 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/operations/lobby)
|
||||
"nAk" = (
|
||||
/obj/structure/platform_deco{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
@@ -95961,6 +95946,15 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hangar/intrepid)
|
||||
"oqJ" = (
|
||||
/obj/structure/platform_deco{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"oqM" = (
|
||||
/obj/structure/bed/stool/bar/padded/red,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -112260,12 +112254,6 @@
|
||||
/turf/space/dynamic,
|
||||
/area/horizon/exterior)
|
||||
"qNs" = (
|
||||
/obj/structure/platform{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
@@ -114849,6 +114837,11 @@
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/light_switch{
|
||||
pixel_x = -19;
|
||||
pixel_y = 3;
|
||||
dir = 8
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"rgs" = (
|
||||
@@ -117618,6 +117611,16 @@
|
||||
icon_state = "2,19"
|
||||
},
|
||||
/area/shuttle/intrepid/atmos_compartment)
|
||||
"rDa" = (
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 8
|
||||
},
|
||||
/obj/machinery/firealarm/west,
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"rDb" = (
|
||||
/obj/machinery/button/remote/airlock{
|
||||
dir = 8;
|
||||
@@ -117706,11 +117709,8 @@
|
||||
/turf/simulated/floor/exoplanet/barren/raskara,
|
||||
/area/centcom/shared_dream)
|
||||
"rDO" = (
|
||||
/obj/structure/platform{
|
||||
dir = 8
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood{
|
||||
dir = 5
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/keycard_auth{
|
||||
dir = 1;
|
||||
@@ -118165,11 +118165,18 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/horizon/crew_quarters/fitness/changing)
|
||||
"rIR" = (
|
||||
/obj/structure/shuttle_part/scc_space_ship{
|
||||
icon_state = "d3-2"
|
||||
/obj/effect/floor_decal/spline/fancy/wood,
|
||||
/obj/effect/floor_decal/spline/fancy/wood/corner{
|
||||
dir = 1
|
||||
},
|
||||
/turf/template_noop,
|
||||
/area/template_noop)
|
||||
/obj/structure/disposalpipe/segment{
|
||||
dir = 4
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 4
|
||||
},
|
||||
/turf/simulated/floor/wood,
|
||||
/area/crew_quarters/heads/hor)
|
||||
"rIS" = (
|
||||
/obj/effect/decal/cleanable/dirt,
|
||||
/obj/structure/closet/crate/trashcart,
|
||||
@@ -145657,10 +145664,6 @@
|
||||
dir = 4;
|
||||
icon_state = "pipe-c"
|
||||
},
|
||||
/obj/effect/floor_decal/spline/fancy/wood,
|
||||
/obj/effect/floor_decal/spline/fancy/wood/corner{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 6
|
||||
@@ -270609,11 +270612,11 @@ lJf
|
||||
kmG
|
||||
ixx
|
||||
ixx
|
||||
ixx
|
||||
xzp
|
||||
ixx
|
||||
cFS
|
||||
cFS
|
||||
cFS
|
||||
ixx
|
||||
ixx
|
||||
oRk
|
||||
@@ -270866,8 +270869,8 @@ oXV
|
||||
bdg
|
||||
ixx
|
||||
bGu
|
||||
rDa
|
||||
dwe
|
||||
lUy
|
||||
rgr
|
||||
rVg
|
||||
aEi
|
||||
@@ -271123,8 +271126,8 @@ aWd
|
||||
aWd
|
||||
ixx
|
||||
rDO
|
||||
cpg
|
||||
juC
|
||||
dSd
|
||||
dSd
|
||||
qNs
|
||||
nAk
|
||||
vPK
|
||||
@@ -271378,13 +271381,13 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
wRk
|
||||
pll
|
||||
obR
|
||||
lnW
|
||||
icC
|
||||
vIK
|
||||
lPJ
|
||||
ixx
|
||||
lUy
|
||||
cpg
|
||||
juC
|
||||
juC
|
||||
oqJ
|
||||
rIR
|
||||
cFS
|
||||
imu
|
||||
upz
|
||||
@@ -271635,13 +271638,13 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
oVT
|
||||
dGr
|
||||
cuk
|
||||
rMd
|
||||
cuk
|
||||
hBJ
|
||||
oaT
|
||||
wRk
|
||||
pll
|
||||
obR
|
||||
lnW
|
||||
icC
|
||||
vIK
|
||||
lPJ
|
||||
ixx
|
||||
ixx
|
||||
aZB
|
||||
@@ -271893,12 +271896,12 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
oVT
|
||||
tWw
|
||||
dRg
|
||||
pxa
|
||||
iVh
|
||||
sLG
|
||||
exS
|
||||
dGr
|
||||
cuk
|
||||
rMd
|
||||
cuk
|
||||
hBJ
|
||||
oaT
|
||||
lCv
|
||||
ohk
|
||||
mhf
|
||||
@@ -272149,14 +272152,14 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
wRk
|
||||
oVT
|
||||
oVT
|
||||
oVT
|
||||
wRk
|
||||
wRk
|
||||
wRk
|
||||
dSd
|
||||
tWw
|
||||
dRg
|
||||
pxa
|
||||
iVh
|
||||
sLG
|
||||
exS
|
||||
lCv
|
||||
ohk
|
||||
mhf
|
||||
mhf
|
||||
@@ -272406,13 +272409,13 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
rIR
|
||||
wRk
|
||||
oVT
|
||||
oVT
|
||||
oVT
|
||||
wRk
|
||||
wRk
|
||||
wRk
|
||||
txt
|
||||
pag
|
||||
pDV
|
||||
@@ -337685,12 +337688,12 @@ cPr
|
||||
cPr
|
||||
dZX
|
||||
dDI
|
||||
sIA
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
cKu
|
||||
@@ -337942,13 +337945,13 @@ eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
eSV
|
||||
rVj
|
||||
sIA
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
hCm
|
||||
ryE
|
||||
cKu
|
||||
cKu
|
||||
gZB
|
||||
|
||||
Reference in New Issue
Block a user