From a23c7636459df2c1f61eee3cd3aa6b5b763e87f2 Mon Sep 17 00:00:00 2001 From: Gandalf <9026500+Gandalf2k15@users.noreply.github.com> Date: Fri, 31 Mar 2023 03:16:54 +0100 Subject: [PATCH] CI fixes (#20177) * fixes for CI * Update _head.dm --- .../code/modules/clothing/head/_head.dm | 8 ++-- .../master_files/icons/mob/clothing/head.dmi | Bin 182844 -> 183150 bytes .../modules/aesthetics/guns/code/guns.dm | 36 ++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm index 8ff16570822..259ea9c9fed 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm @@ -4,7 +4,7 @@ /// Also handles hiding the ear slot properly after equipping a hat /obj/item/clothing/head/visual_equipped(mob/living/carbon/human/user, slot) . = ..() - if(!ishuman(user)) + if(!istype(user)) return if(slot & ITEM_SLOT_HEAD) if(user.ears && (flags_inv & HIDEEARS)) @@ -20,13 +20,13 @@ /obj/item/clothing/head/dropped(mob/living/carbon/human/user) . = ..() alternate_worn_layer = initial(alternate_worn_layer) - if(user.ears && (flags_inv & HIDEEARS)) + if(istype(user) && user.ears && (flags_inv & HIDEEARS)) RegisterSignal(user, COMSIG_CARBON_UNEQUIP_HAT, PROC_REF(update_on_removed)) - + /// After the hat has actually been removed from the mob, we can update what needs to be updated here /obj/item/clothing/head/proc/update_on_removed(mob/living/carbon/user, obj/item/hat) SIGNAL_HANDLER - if(ishuman(user) && user.ears) + if(istype(user) && user.ears) user.update_inv_ears() UnregisterSignal(user, COMSIG_CARBON_UNEQUIP_HAT) diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index 2b75f083b7cd94018b79abd81bdb3f1c3ad5f5dc..f3193ea5ac3adbd5cac6da637dbb1e054445fbbb 100644 GIT binary patch delta 1555 zcmbu8eKga19LIl#9I0E~aFbGiS-R*ghw zht<}WhnVYWZVpAYNk%BMjA3lU=3%q#{^tMt*Zu4J{eHgh^ZL9$pYP|}QEni5WKd$R zmEK?xt8bDF#~CPO5&^gRr)rfPrv_WSu{FDU9iHWp^z%vjS`3mtOjQFr3Xn+@m?@|* z_$0KQ22}XC=cuTrJJ<)cBL`7d6Gf(ze9u^sSGhjR)arhkPT#=zr6;a8 zrb}(S-i{}$=%YRD&UdArD0oldkjY>3ksvz$Y8%7XE&O&_*S+A1u6ZYM<+K2kxnjx2 zuqvqtHYOVYfNphJ3{(3ga%~Y*FLxMiDE0Qtkcjh#9Hms(m9KuAq74$^P_BQ-i6B~( z9OKk1U(Tr$#(Zgj&(gZN*lRb&$*gF85m_*)9nyR3Ty1SG$2r2N-rt5QhTwoQCfG`X zoUMYn%T#(}pv2cw?L;uu+p)TM0W68eD%&YXQyg>)sV_%o7C={B)!Ucz->}!ji?XHA zRo)uB^dlV%H1eX?MJ7AQc0#n&X!;F8F5Lk~*g;U2uUa|@n-YG#(_5`whT@XnfLo#-b>>=S1BQSQ_q-K65C*a`CL znzHGNkO&uFFX~uMEw$psp;z`ngdA1VqW)m7_fuTw@tz9{rz=7WoVobF2Q^s-B>N!+ zApcwd^PRiXnYCtwY)qc+^Y#IKERor&Mf+ymhE6)OzSt*VJ-IXSK~WLy#SsmYx-X}Z zvWT1d2OZ7Fs4;l-k0Y79-Y7zTNhdvG?Kj5^ztXY2EnoQj=$K=3lWvNF-UW+(sdSSr ziU2gd^QQ@c)W{y+hvsCT>JOE0)zcferpbT}?R7WT)Az6vkRV8`?h>XchaMhoFGxoi zHLu^C>dG(VHPc+BLzrd`>cEy#6c@o}bge6l@^5}0L2!cIkppIRWHwu|S;_of)y~AX zHkx67mqaeVBSj1Z_Nnc}^0(Ra+AhEla`0ljA}Koovar1Q&}Nlhl_f?uY>vnX`B!45 z)|Jjs#mNm6V-uMM5+OH$KOeg@tZp(84p8gRCBd7q|E>rmIS> zx9!*-$c+cHbryQ0x9oIFmL;)j2S~HiS=x2vY_ZuhDh7>9UmhQx@jvXj)|O3XRYZiT z@0s_9{-Q=@Dt~ps8db@Rv&_chvsitDKR@!c{=f&FVzM@?k2C+oTv~n zc7?IVhzrd8{nPD*jhF2d?j`0R_e~2mE)urgk&saKsx=6)3OrFy|(6PSjsJVS+6VwCY`ck zGY0ZXZgI4sJHWb@>Nj;>+w^XMADL|db@Mw;C>IX-GbpZFcG0kv7ndg7iA$KjGq`r3uT6w&w_lx7IqY zIS&TGd^KxL!**qWN0k1yFsJY5?Y;m-7J#lsaPa*07XVH^`foshM)*GnDudSYSZPM` Q7)t{}{^{dI_l(T_7Z#}a8~^|S delta 1247 zcmaDijeE}&?g=W4WgAt~I3?;IwA9=F`T2eM;pO}7?*EtfEXr=oytDjw^AgVXC7g`g zmvA!uTfijWx_rqhCh7X!>}y}~FkAeaqt)T59JfL=Ihr%HJ9bNSn^GkAQNBE}IZTUY zcrCPuaAYpq(9z1(raFRLB8Bbuf}Ypj{} zb5%oY+Rk5mK*KM@&DzBzFIc?o!1emSx_v;i?f{of9Vv%a=(Wzh701adaozBb4Yx=c0 ze{Y=k{+=57*SpJ89xIy%xf}tSDk%7|;8)$3H@D{Q{e5m*$k89y*KMn_nsRL4EA6NM z?@CKwioahczWv+x)abr=Z$aaa#!8PazHsrGb8GV6{crcG{9^<;*>Bc9rvF)Qx7J78 z->cl+@#5xIYwMafB`#-}EkjX?x{4 zH7r0A7W_4-Wh$`)xk}DnGd@4ZBX!^JPmv%yEB}BLG?Z;w!ocNy_4@VeuiSxrh6RV> zvbb$PtOH(`zKH!uFD<(oRPS=+#f_9dCV!l3egy6ef9U_lcE+dk&Efh}>Ueiw{ah^m zUDm5ye)*;O50BhyURmuc#=dS&IV&hi8@6p-q5WZQ?A9-3=VuEF7FPf9>*@1#b2;*? zSGM)|2AdzX0kdlt&WTtie+G1_+j#e)9_F8|oMIr-}T z`~PBp+)00aw{}j_j(UZ&KkGr>a+n?QMQF*%YW_>#*3N#;a$%zU@yAoI2Di3tcz$%- zCZ(9w&!2Dp6ujKpI?Q$TqsImR9e({hSntE~*Iy)WlJEkM2_l&ny(c`get9!AT6Xex zxg|gA>MV6cB&+r3o^Jci&Ncfk-)HIctyXnzE>AvguJ*ll={ZPO!}G{XVn1H4tSYPi zbFRqtH1}SOO|k3kI~OUX)V(TFOm#cJ9DXi6)$RIEo#WOHpy*%V;mx(6_fx7zYQ2tA zQkb@X9ADht2|(XGdbH13w|fJ~)D07+$2DD9v3d2hPrM&42Y=1^e5^0Ea>Y@tBIc_1 zON%4(1NYao7Bh)}98k9Pg{lWIDokuc#rH)Bc~1ZtpmAx@`UBnbK}?6;(c8)!m_W=e u(u^Q23@dcNbUlnQK(rFvB@8Rp)HCQE=wPfX+X@tAVDNPHb6Mw<&;$SjJSbEE diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm index 60e2bf23903..aefdba75fd6 100644 --- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm +++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm @@ -196,15 +196,51 @@ fire_sound = 'modular_skyrat/modules/aesthetics/guns/sound/laser_cannon_fire.ogg' /obj/item/gun/ballistic/automatic/sniper_rifle + name = "sniper rifle" + desc = "A long ranged weapon that does significant damage. No, you can't quickscope." icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_gubman2.dmi' icon_state = "sniper" + w_class = WEIGHT_CLASS_BULKY + inhand_icon_state = "sniper" + worn_icon_state = null + fire_sound = 'sound/weapons/gun/sniper/shot.ogg' + fire_sound_volume = 90 + load_sound = 'sound/weapons/gun/sniper/mag_insert.ogg' + rack_sound = 'sound/weapons/gun/sniper/rack.ogg' + suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' + recoil = 2 + weapon_weight = WEAPON_HEAVY + mag_type = /obj/item/ammo_box/magazine/sniper_rounds fire_delay = 6 SECONDS + burst_size = 1 + w_class = WEIGHT_CLASS_NORMAL + slot_flags = ITEM_SLOT_BACK + actions_types = list() + mag_display = TRUE + suppressor_x_offset = 3 + suppressor_y_offset = 3 + +/obj/item/gun/ballistic/automatic/sniper_rifle/Initialize(mapload) + . = ..() + AddComponent(/datum/component/scope, range_modifier = 2) + +/obj/item/gun/ballistic/automatic/sniper_rifle/reset_semicd() + . = ..() + if(suppressed) + playsound(src, 'sound/machines/eject.ogg', 25, TRUE, ignore_walls = FALSE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_distance = 0) + else + playsound(src, 'sound/machines/eject.ogg', 50, TRUE) /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate + name = "syndicate sniper rifle" + desc = "An illegally modified .50 cal sniper rifle with suppression compatibility. Quickscoping still doesn't work." icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_gubman2.dmi' icon_state = "sniper2" worn_icon_state = "sniper" fire_delay = 5.5 SECONDS + can_suppress = TRUE + can_unsuppress = TRUE + pin = /obj/item/firing_pin/implant/pindicate /obj/item/gun/ballistic/automatic/sniper_rifle/modular name = "AUS-107 anti-materiel rifle"