From 52398aa0cf9bc89811755ef3b7da64e4de1e64a4 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 5 Feb 2018 17:53:12 -0600 Subject: [PATCH 1/5] Adds Phase Pistols --- .../projectiles/guns/energy/special.dm | 10 ++++++++++ code/modules/projectiles/projectile/energy.dm | 8 +++++++- icons/obj/gun.dmi | Bin 84173 -> 84942 bytes .../southern_cross/structures/closets/misc.dm | 12 ++++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 84697e668dd..70138487e37 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -25,6 +25,16 @@ charge_cost = 480 projectile_type = /obj/item/projectile/ion +/obj/item/weapon/gun/energy/phasegun + name = "phase pistol" + desc = "The NT Mk26 EW Apollo is an energy handgun, specifically designed for use against wildlife." + icon_state = "phase" + item_state = "taser" //I don't have an in-hand sprite, taser will be fine + slot_flags = SLOT_BELT|SLOT_HOLSTER + charge_cost = 300 + projectile_type = /obj/item/projectile/energy/phase + + /obj/item/weapon/gun/energy/decloner name = "biological demolecularisor" desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements." diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index d3bc093cacb..81381461630 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -195,4 +195,10 @@ light_color = "#0000FF" embed_chance = 0 - muzzle_type = /obj/effect/projectile/pulse/muzzle \ No newline at end of file + muzzle_type = /obj/effect/projectile/pulse/muzzle + +/obj/item/projectile/energy/phase + kill_count = 4 + damage = 5 + SA_bonus_damage = 55 // 60 total on animals. + SA_vulnerability = SA_ANIMAL \ No newline at end of file diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index a9c1789bf4eede81136696a9307a0fecb85a87e9..2ea4f3c31cad1a1f952a92ad4071842f3191fcf3 100644 GIT binary patch delta 6250 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 diff --git a/maps/southern_cross/structures/closets/misc.dm b/maps/southern_cross/structures/closets/misc.dm index d3a8e34f53d..77ecb795f3d 100644 --- a/maps/southern_cross/structures/closets/misc.dm +++ b/maps/southern_cross/structures/closets/misc.dm @@ -26,6 +26,18 @@ new /obj/item/weapon/gun/projectile/shotgun/pump/rifle(src) return +/obj/structure/closet/secure_closet/guncabinet/phase + name = "phase pistol cabinet" + req_one_access = list(access_explorer,access_brig) + +/obj/structure/closet/secure_closet/guncabinet/phase/New() + ..() + new /obj/item/weapon/gun/energy/phasegun(src) + new /obj/item/weapon/gun/energy/phasegun(src) + // One spare cell per gun + new /obj/item/weapon/cell/device/weapon(src) + new /obj/item/weapon/cell/device/weapon(src) + //Explorer Lockers /obj/structure/closet/secure_closet/explorer From c30d1ca57b464da72cf52e3a0577cbe3d2a549a5 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 5 Feb 2018 18:01:11 -0600 Subject: [PATCH 2/5] Tweaks the Explorer suit --- code/modules/clothing/suits/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 9b884961193..bc2f1b82eab 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -782,7 +782,7 @@ obj/item/clothing/suit/storage/toggle/peacoat hooded = TRUE hoodtype = /obj/item/clothing/head/hood/explorer siemens_coefficient = 0.9 - armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50) // Inferior to sec vests in bullet/laser but better for environmental protection. + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection. allowed = list( /obj/item/device/flashlight, /obj/item/weapon/gun, From 94a3a3b9edc522964e8a9cf579b28b8145102cd1 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 5 Feb 2018 18:21:51 -0600 Subject: [PATCH 3/5] Maps in the proper Explorer gun cabinet --- maps/southern_cross/southern_cross-3.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index fb27f43910c..84dd6a60490 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -110,8 +110,8 @@ "cf" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/surface/outpost/mining_main) "cg" = (/obj/effect/floor_decal/industrial/warning{dir = 6},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/tiled/steel_dirty,/area/surface/outpost/mining_main) "ch" = (/obj/machinery/deployable/barrier,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor/tiled,/area/surface/outpost/main/security) -"ci" = (/obj/machinery/light{dir = 1},/obj/structure/closet/secure_closet/guncabinet/rifle,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/main/security) -"cj" = (/obj/structure/closet/secure_closet/guncabinet/rifle,/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/turf/simulated/floor/tiled,/area/surface/outpost/main/security) +"ci" = (/obj/machinery/light{dir = 1},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/obj/structure/closet/secure_closet/guncabinet/phase,/turf/simulated/floor/tiled,/area/surface/outpost/main/security) +"cj" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/structure/closet/secure_closet/guncabinet/phase,/turf/simulated/floor/tiled,/area/surface/outpost/main/security) "ck" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/obj/structure/table/standard,/obj/item/weapon/book/codex/corp_regs,/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/turf/simulated/floor/tiled,/area/surface/outpost/main/security) "cl" = (/obj/machinery/status_display,/turf/simulated/wall,/area/surface/outpost/main/gateway) "cm" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/tiled/techfloor,/area/surface/outpost/main/gateway) From 441bb3430ec56548b1d88c0e124ad5763da4427b Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 5 Feb 2018 19:06:22 -0600 Subject: [PATCH 4/5] Corrects some small mistakes --- code/modules/clothing/suits/miscellaneous.dm | 2 +- icons/obj/gun.dmi | Bin 84942 -> 84933 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index bc2f1b82eab..5ecef18d7d6 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -807,7 +807,7 @@ obj/item/clothing/suit/storage/toggle/peacoat flags_inv = HIDEEARS | BLOCKHAIR min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE siemens_coefficient = 0.9 - armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50) + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) /obj/item/clothing/suit/varsity name = "black varsity jacket" diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 2ea4f3c31cad1a1f952a92ad4071842f3191fcf3..4bb7b955a0d63f24e227762615f3854e215babb8 100644 GIT binary patch delta 6168 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 Date: Mon, 5 Feb 2018 19:34:46 -0600 Subject: [PATCH 5/5] Changelog --- html/changelogs/Anewbe - ExplorerGear.yml | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/Anewbe - ExplorerGear.yml diff --git a/html/changelogs/Anewbe - ExplorerGear.yml b/html/changelogs/Anewbe - ExplorerGear.yml new file mode 100644 index 00000000000..19eba8cbfbb --- /dev/null +++ b/html/changelogs/Anewbe - ExplorerGear.yml @@ -0,0 +1,37 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Lessens the bomb, bio, and rad protection on the Explorer Suit." + - tweak: "Replaces the Hunting Rifle cabinets with a Phase Pistol cabinet. Same general purpose, shoot animals, kill animals. Shoot people, get laughed at."