From 9015b22f62e6d4ee24c0fabfbdcf5baa126e42c9 Mon Sep 17 00:00:00 2001 From: qweq12yt <45515587+qweq12yt@users.noreply.github.com> Date: Thu, 25 Mar 2021 17:34:23 -0300 Subject: [PATCH] removed wind-up gun and derringer from code they were not ready, this branch is now more focused on adding stuff that is on the game already --- .../projectiles/guns/ballistic/revolver.dm | 21 ---------- code/modules/projectiles/guns/energy/laser.dm | 39 ------------------ sound/weapons/derringer.ogg | Bin 18802 -> 0 bytes sound/weapons/wind_up_1.ogg | Bin 50468 -> 0 bytes sound/weapons/wind_up_2.ogg | Bin 48557 -> 0 bytes sound/weapons/wind_up_3.ogg | Bin 46702 -> 0 bytes 6 files changed, 60 deletions(-) delete mode 100644 sound/weapons/derringer.ogg delete mode 100644 sound/weapons/wind_up_1.ogg delete mode 100644 sound/weapons/wind_up_2.ogg delete mode 100644 sound/weapons/wind_up_3.ogg diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index dc16d3c0ef..0d60203cb5 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -494,24 +494,3 @@ var/mutable_appearance/charge_bar = mutable_appearance(icon, "[initial(icon_state)]_charge", color = batt_color) charge_bar.pixel_x = i . += charge_bar - - -// the derringer is neither a pistol or revolver, but for code sanity it will be here -// the idea is for it to not show on your sprite, be silent, but also not deal much damage -// also -/obj/item/gun/ballistic/revolver/derringer - name = "derringer pistol" - desc = "A favorite among dentists and vengeful heroes. Hides neatly inside your sleeves! Uses .38 rounds." - fire_sound = "sound/weapons/derringer.ogg" - icon_state = "pistol" // placeholder - - // not visible in sprite, we want it to be like in jango - // not having it show on examining would be good and 'if (wearing clothes)' would desirable - item_state = null - mag_type = /obj/item/ammo_box/magazine/internal/cylinder/derringer - suppressed = TRUE // it needs to be good at something - w_class = WEIGHT_CLASS_SMALL - -// you can't spin a derringer! -/obj/item/gun/ballistic/revolver/derringer/do_spin() - return diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 9dba515a28..8e61221cc8 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -246,42 +246,3 @@ chambered.BB.damage *= 5 process_fire(target, user, TRUE, params) - -// part of contraband assortments -/obj/item/gun/energy/laser/windupgun - name = "wind-up rifle" - cell_type = /obj/item/stock_parts/cell/crap/empty // can't be so good right? - ammo_type = list(/obj/item/ammo_casing/energy/laser) - desc = "A rifle using not so state-of-the-art mechanism of self charging. Music Box included" - icon_state = "laser" - item_state = "laser" - can_charge = FALSE // it is wind-up after all - dead_cell = TRUE - shaded_charge = FALSE // we don't want to see charge ammount, or do we? - var/music_box_state = -1 // part of the song to play - var/music_part = "" // and the path for said part - -/obj/item/gun/energy/laser/windupgun/proc/set_music_state() - music_box_state = (music_box_state + 1) % 4 - switch (music_box_state) - if (0) - music_part = "sound/weapons/wind_up_1.ogg" - if (1) - music_part = "sound/weapons/wind_up_2.ogg" - if (2) - music_part = "sound/weapons/wind_up_1.ogg" - if (3) - music_part = "sound/weapons/wind_up_3.ogg" - -/obj/item/gun/energy/laser/windupgun/attack_self(mob/living/user) - if(cell.charge < cell.maxcharge) - to_chat(user, "You begin turning the key...") - if(do_after(user, 20, target = user)) - set_music_state() - playsound(user, music_part, 20, FALSE, ignore_walls = FALSE) - cell.give(100) // equivalent of one shot - to_chat(user, "[src.cell.charge / 100] shot\s loaded.") - else - to_chat(user, "You need to stay still to do this!") - else - to_chat(user, "It's already fully charged!") diff --git a/sound/weapons/derringer.ogg b/sound/weapons/derringer.ogg deleted file mode 100644 index 637d652ebfedbec59cf8fa245db06a78d2767c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18802 zcmeFZbyQT}yD)x+1_=?Q1Oz1oB}JMM!Js9iySuvv1ZhD)Iz>qVC8WD^K%}H4M!Fe> zn0XKS`QG>YyT7~M`&;X--+%96&t5y8y`Qt6+Ru)IvZbXOfCc>Xgh>BQhzW)?LKq<) zjxHwFu2)4^u!es?oc{vXLX@vs{>O9G5(4Iq>%?$xSYZCs^A7uOS6m>3mbH`B17#OW zCOd1BSAP&Ny
Tk&=M`Y$P_}olc5*RyHFt31yh23<{?uQnE67SXIXW3yI-0v0
zswgQxu(viNxvEip{6txKQ()?Xjl^jHz;ysHV&NoB
zuz11wDKVGBJ0oCm8N !xU=Kze$W5jVEna
z1O+f^-YX~r;3wb~WEw2(&fsO%2tbQaeeP_OE5DZF;my6&tSHT`v
zaWFh{lj%!T7&=lQ`xg_g*bV?tKKd?a`aX~vs`tlS9%{NuOu8ygf~2^j$p85X`Xevk
zK$tTvl5AiE0&&KF$N~eqrO73DLi`sK2oRpT!jv|Wb~q$Lnzou#M43L;7NMTbURRWo
z{)dBh!?epFFFE^DyK+)T(p-mM5T||moASPqj$c~z9W0|oWRP~#8iR1w-_!7mrnSJf
z+9PReg>{r*Dk3qRy}C~QZ-4)YMUg?qaGS^y*dpR*x@{eyKA1w8W$X+QUX}f4@qvPT
zGoGU9&J1Sqe~V{A$(+xez~~lBnvlcS%lVNp=Iv9tqSq>_wCtbUg8z)12>?Q_|B>Q<
zMSn#3uM~fbkG$8
YPhwt~gXm_f9keTy>jo9@ndwgJ9XyWTy%1?EKj|m!!67Wr?-1;OFtan&6?2%8Ow9A!@m;=e
z9C9L5Onr0>mBsJ{cd!xN!C#NI!EXwzYPaeY_y}{xe+=hO>3?j<<_tU+TVTTXf4Dpm
z6T7K+3yBUjM;rMaqg>TfnF()pwjYFMpmKBE`HtK$Q#YWq7|F7qbfPJI{cZU1q*<
z@yjYH{*}j{vzEQRgawx<&aRPk4M4j}dS(_VL}VN4I@%pSZ7V?gwxqtF3yY}Xk}X=e
zoJ>}e!f3+drnwZ3131`x;=f<0_RdWA5xyC8I}nPle15p2rn*3`7BR^Cmb_4%$V+6q
z-`IIk3{=!R?D8pR5t}0B`S>I2Er;1~OUnXu@im;7h~E$>Y(>R_=$8;5F~yr%Zojpz
z82l$mJDhujPtMZJ@PeepZqK}-jdpAWfLakzE0%H-8UWTMW2fpZXjElHi=yHZyqR=e
zOA88Vy%xPpI{&8gS3C>xwYyJZe$(A(wLe&cwwCfWU3==<`;voFEo*jS&wj>A@W&^v
zkVFNnQ=KTGv-6J)G-q2i$U{Ee)XDkXnb^^V0gj!f3uQJk!%bv2z1((kjs963Uq*bg
z^{>szCkB#7xrZ*|5`xNI-xu7n&Q>MVTTm-rgA&syH$}-z#kNVxGY$)$atSV?O*ILz
z-3;NTLCG6p3Z45IQ9qOwU%CD~-?u|(DVRHK3@U4`QSzy&=?#6bM$Sl0=q+>-Yl!V^
z35;h~F0scLC$BeVU-XTN!qbPKNWoO=dv_RT9DrK8r
}BH&00Y010RWjPBbclf%l30w71~y&U|N=4
J+&X^%b9wz;==U>V^Z6^6dOUuJZx@CIJgT~I%5b!Ye~>1E}p9g8EzN95!=
zNqusTA&+!JRwF9~$Hd$FQHPjl(|(cu?QQnbon0!!fI40O$J4J(OibiQB|kc*2Kw0B
z+V37aIpP`osPR@e3b
nq5M;kKLXvQ5!c+4lRGiv3GWcP&%zHIDCnZDKbav#E4
z