From e17eccae934cbf2f844458ae063a36697a11fe1f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 20 Apr 2017 20:04:21 -0500 Subject: [PATCH 1/3] Adds ion pistol to uplink, allows holstering --- code/datums/uplink/visible_weapons.dm | 5 +++++ code/modules/projectiles/guns/energy/special.dm | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink/visible_weapons.dm b/code/datums/uplink/visible_weapons.dm index 41a1779322..34b20a9f48 100644 --- a/code/datums/uplink/visible_weapons.dm +++ b/code/datums/uplink/visible_weapons.dm @@ -100,6 +100,11 @@ item_cost = 40 path = /obj/item/weapon/gun/energy/ionrifle +/datum/uplink_item/item/visible_weapons/ionpistol + name = "Ion Pistol" + item_cost = 25 + path = /obj/item/weapon/gun/energy/ionrifle/pistol + /datum/uplink_item/item/visible_weapons/xray name = "Xray Gun" item_cost = 85 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index faafd2e8c9..7d2d5f0e1c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -21,7 +21,7 @@ item_state = null w_class = ITEMSIZE_NORMAL force = 5 - slot_flags = SLOT_BELT + slot_flags = SLOT_HOLSTER charge_cost = 480 projectile_type = /obj/item/projectile/ion From a7d4a657305d56ad43fd1ac57ec14628fdb4c975 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 21 Apr 2017 12:12:17 -0500 Subject: [PATCH 2/3] Changelog --- html/changelogs/Anewbe - Ion Pistol.yml | 37 +++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/Anewbe - Ion Pistol.yml diff --git a/html/changelogs/Anewbe - Ion Pistol.yml b/html/changelogs/Anewbe - Ion Pistol.yml new file mode 100644 index 0000000000..efc5c77c0e --- /dev/null +++ b/html/changelogs/Anewbe - Ion Pistol.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: + - rscadd: "Adds the ion pistol to the uplink." + - tweak: "The ion pistol can now be holstered. \ No newline at end of file From a4d9db202bbcbd794c7388517561b6fcd4af717f Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 21 Apr 2017 19:24:06 -0500 Subject: [PATCH 3/3] Allows ion pistol on the belt. --- code/modules/projectiles/guns/energy/special.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 7d2d5f0e1c..8fbfc0e657 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -21,7 +21,7 @@ item_state = null w_class = ITEMSIZE_NORMAL force = 5 - slot_flags = SLOT_HOLSTER + slot_flags = SLOT_BELT|SLOT_HOLSTER charge_cost = 480 projectile_type = /obj/item/projectile/ion