From d2e55621161708e82e72a8f049576e0b341c1716 Mon Sep 17 00:00:00 2001 From: Ben <91219575+Ben10083@users.noreply.github.com> Date: Thu, 15 Feb 2024 12:32:57 -0500 Subject: [PATCH] Adds new Golden Deep Ornate Energy Pistol and gives it to Consular (#18343) * Code for da gun & changelog * less crazy * Adjust * fix + temp projectile * fix * Golden deep suit and caps to effects * noise * Sprites and LORE * nerf * forgot cap * Dizzy * Forgot to renable eyeblur, should be final change * changes * disabler projectile * Suggested Changes * Requested Changes --------- Co-authored-by: Ben10083 --- code/modules/background/citizenship/ipc.dm | 4 +- .../projectiles/guns/energy/nuclear.dm | 28 +++++++++++- code/modules/projectiles/projectile/beams.dm | 27 +++++++++++ .../Ben10083 - Golden deep pistol.yml | 42 ++++++++++++++++++ icons/obj/guns/goldendeep_ornatepistol.dmi | Bin 0 -> 1140 bytes 5 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/Ben10083 - Golden deep pistol.yml create mode 100644 icons/obj/guns/goldendeep_ornatepistol.dmi diff --git a/code/modules/background/citizenship/ipc.dm b/code/modules/background/citizenship/ipc.dm index 2a80f12ff60..bdb64f1b951 100644 --- a/code/modules/background/citizenship/ipc.dm +++ b/code/modules/background/citizenship/ipc.dm @@ -34,7 +34,7 @@ /datum/outfit/job/representative/consular/golden name = "Golden Deep Consular Officer" - uniform = /obj/item/clothing/under/suit_jacket/burgundy + uniform = /obj/item/clothing/under/goldendeep/suit backpack_contents = list( - /obj/item/gun/energy/pistol = 1 + /obj/item/gun/energy/pistol/goldendeep = 1 ) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index f073cb59a11..7bbe57786af 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -177,6 +177,32 @@ list(mode_name="smite", projectile_type=/obj/item/projectile/beam/pistol/hegemony, modifystate="hegemony_pistol", fire_sound='sound/weapons/laser1.ogg') ) +/obj/item/gun/energy/pistol/goldendeep + name = "golden deep ornate energy pistol" + desc = "An intricate golden energy pistol, engraved with a quality unlike no other. If you had to describe this pistol in one word, it would be expensive." + desc_extended = "Possessed by only the most affluent affiliates of the Golden Deep, this ornate energy pistol covered in gold is the result of a commission, which had the artistic quality of Ultra Maz combined with the scientific technology acquired by the Estriconian to produce a weapon that many outsiders see as a firearm more valuable than the assets it was made to protect." + icon = 'icons/obj/guns/goldendeep_ornatepistol.dmi' + icon_state = "ornatepistolstun100" + item_state = "ornatepistolstun100" + has_item_ratio = FALSE + fire_sound = 'sound/weapons/laser2.ogg' + slot_flags = SLOT_BELT|SLOT_HOLSTER + max_shots = 10 + fire_delay = 3 + can_turret = FALSE + secondary_projectile_type = /obj/item/projectile/beam/pistol + secondary_fire_sound = 'sound/weapons/laser3.ogg' + can_switch_modes = TRUE + + projectile_type = /obj/item/projectile/beam/disorient + origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3) + modifystate = "ornatepistolstun" + + firemodes = list( + list(mode_name="disorient", projectile_type=/obj/item/projectile/beam/disorient, modifystate="ornatepistolstun", fire_sound='sound/weapons/Taser.ogg'), + list(mode_name="lethal", projectile_type=/obj/item/projectile/beam/pistol, modifystate="ornatepistollethal", fire_sound='sound/weapons/laser1.ogg') + ) + /obj/item/gun/energy/repeater name = "energy repeater" desc = "A Stellar Corporate Conglomerate created energy repeater, extremely lightweight. It has three settings: Single, Three-Burst, and Full-Auto." @@ -319,7 +345,7 @@ can_turret = FALSE secondary_projectile_type = /obj/item/projectile/energy/blaster/skrell secondary_fire_sound = 'sound/weapons/laser3.ogg' - can_switch_modes = 1 + can_switch_modes = TRUE projectile_type = /obj/item/projectile/energy/disruptorstun/skrell modifystate = "psipistolstun" diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 38283ef2898..470ca5c09cd 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -222,6 +222,33 @@ tracer_type = /obj/effect/projectile/tracer/stun impact_type = /obj/effect/projectile/impact/stun +/obj/item/projectile/beam/disorient + name = "disorienting pulse" + icon_state = "stun" + damage = 1 + sharp = FALSE + eyeblur = 1 + agony = 30 + damage_type = DAMAGE_BURN + + muzzle_type = /obj/effect/projectile/muzzle/disabler + tracer_type = /obj/effect/projectile/tracer/disabler + impact_type = /obj/effect/projectile/impact/disabler + +/obj/item/projectile/beam/disorient/on_hit(var/atom/target, var/blocked = 0) + if(ishuman(target) && blocked < 100 && !issilicon(target) && !isipc(target)) //Make them trip + var/mob/living/carbon/human/H = target + H.druggy = min(H.druggy + 15, 75) + + //do some maths to determine amount of dizzy to add + var/makeDizzy = 250 - H.dizziness + makeDizzy = min(makeDizzy, 50) //This should make it go back to 50 + H.make_dizzy(makeDizzy) + + H.confused = 5 + H.slurring = min(H.slurring + 15, 75) + . = ..() + /obj/item/projectile/beam/gatlinglaser name = "diffused laser" icon_state = "heavylaser" diff --git a/html/changelogs/Ben10083 - Golden deep pistol.yml b/html/changelogs/Ben10083 - Golden deep pistol.yml new file mode 100644 index 00000000000..59660ca0b29 --- /dev/null +++ b/html/changelogs/Ben10083 - Golden deep pistol.yml @@ -0,0 +1,42 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Ben10083 + +# 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 a new gold-plated pistol for Golden Deep Representatives. Credit to NobleRow for sprites" + - tweak: "Golden Deep Consular job outfit adjusted." diff --git a/icons/obj/guns/goldendeep_ornatepistol.dmi b/icons/obj/guns/goldendeep_ornatepistol.dmi new file mode 100644 index 0000000000000000000000000000000000000000..290fb068a8032aeed0165ed591c76c5cd2d917eb GIT binary patch literal 1140 zcmV-)1dIELP)q@PC0JZ_=@wOa;2nfjl|FsGVhhhLXH#ZUz5;Qb492^|~__~MyttBKR5fKrCUI4pY z*1veu#+TFk4i5B9O>sDZkw>O;Nq&`GrgK<&m~*3nC@8f#IrM*j_N}dfK0dx#S$V=-0C=38ld%fIFcd}S z@P^5(F9^5$y0ydq;GIh@VVVLoE$iiTI`3zIEnr^@`sMe1}}DE zvuZed+8Inf)-7j7+lv7_5-8AlRw4SlZZ<)13GV*nOvTx3V=7N@c8=<*%a)%Rr@<&k zr502C%S5D#NjA-!k-st9j*N74OG~%VBp8hv04ZVugoqIkB4$A7tEd*k)Gwdm1v_Z= zyDGO}UjP6C@<~KNRCt{2+Us)KFc1Y`OUMwSB{=t{X_}2Oh>x1>{vi126 z^ZgydeBiQO7q=DM$S+#!FACSsE_~|-{$l*aZ3Q<{tzT73U-{+s!E@*;**Ld%K)JxJh?WU%Y=%$y*3#*jlKH`~4C9y|}~~wib%}{o%F$PWtK2C6>KQ zm#k3I?~m;7JC`V28UO$Q003YbqB6G>({L1{TQL`pXFZi$i!rVokqdL?0@11@w-zZ6 z7bslK*xao`2yt+3j?z;RToSHWnl3#oG19=?9EJ6oAMZS5`X@9^dT5A-=H}AJbIsCo z5;kvdo^by^a3VKHJWL*k+-Al+UNbniM|r^fp``Toy2#@-1-Utj>&<{oaQt*P)Rg4b z{eFJNDSy-QeAF?2e=gSkeS|Fp-?OzK-itq^`4Mlr=R1{;I-f6XArx*c?B-iH$>t62 zoWCbG@Ar8?{u$@<$CHl!)H#(~_xn6w%F@@A_xUTTFgNe_dBFV3-TUk75xF_a-?1dm zcPh7+ey@Uo=MU^_zU|*1 zzp)#spMUz!Zl(PB2fLHFYL?yfVQ8v z&ei?Ab*}E`t#f@pZ=I|AdHY<~&s*o}etr_UqMx_U)&2Y=az#IHovZtK>s;N>Tj%W0001(0G!{qv+LhqncUC6vFV=QfB(f^rGEb7H+!4z`Tch$_wyeN=l9PI=l9Lw z{Jt^$`F&&R^ZUm1=l6}N&+i-4pWioz^ZVw|&jSGbzy1KIwt;OgZFeI80000