From 1fd1f528d2537117eafcd82d9e5b4014d6f65c82 Mon Sep 17 00:00:00 2001 From: Geeves Date: Tue, 16 Jun 2020 23:29:33 +0200 Subject: [PATCH] Kataphract Supplies (#8529) --- code/datums/ert/outsider.dm | 1 + code/modules/heavy_vehicle/premade/light.dm | 13 +- .../species/station/ipc/ipc_subspecies.dm | 1 + .../modules/projectiles/ammunition/bullets.dm | 6 + .../projectiles/guns/projectile/sniper.dm | 56 +++++++ .../modules/projectiles/projectile/bullets.dm | 20 ++- .../changelogs/geeves-kataphract_supplies.yml | 8 + icons/obj/ammo.dmi | Bin 33423 -> 33988 bytes icons/obj/guns/unathi_slugger.dmi | Bin 0 -> 1777 bytes maps/templates/distress/distress_equipment.dm | 6 +- maps/templates/distress/kataphracts.dmm | 151 ++++++++++++++++++ 11 files changed, 259 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/geeves-kataphract_supplies.yml create mode 100644 icons/obj/guns/unathi_slugger.dmi create mode 100644 maps/templates/distress/kataphracts.dmm diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index f04b456f1b9..a4f4e192df5 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -7,6 +7,7 @@ name = "Kataphracts" chance = 15 spawner = /datum/ghostspawner/human/ert/kataphract + equipment_map = /datum/map_template/distress_kataphract /datum/responseteam/iac name = "Interstellar Aid Corps" diff --git a/code/modules/heavy_vehicle/premade/light.dm b/code/modules/heavy_vehicle/premade/light.dm index f4889467f51..4ba3f8f9bfe 100644 --- a/code/modules/heavy_vehicle/premade/light.dm +++ b/code/modules/heavy_vehicle/premade/light.dm @@ -102,4 +102,15 @@ h_l_shoulder = /obj/item/mecha_equipment/crisis_drone h_r_shoulder = /obj/item/mecha_equipment/mounted_system/flarelauncher h_l_hand = /obj/item/mecha_equipment/mounted_system/medanalyzer - h_r_hand = /obj/item/mecha_equipment/clamp \ No newline at end of file + h_r_hand = /obj/item/mecha_equipment/clamp + +/mob/living/heavy_vehicle/premade/light/kataphract + name = "kataphract exosuit" + desc = "A light and nimble exosuit, bearing the colour scheme of the Unathi Kataphracts." + + e_color = COLOR_CHESTNUT + + h_back = /obj/item/mecha_equipment/quick_enter + h_l_hand = /obj/item/mecha_equipment/clamp + h_r_hand = /obj/item/mecha_equipment/catapult + h_l_shoulder = /obj/item/mecha_equipment/mounted_system/flarelauncher \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm index 525a2c5e73f..c2b6aaca5b8 100644 --- a/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/ipc/ipc_subspecies.dm @@ -116,6 +116,7 @@ name_plural = "Industrials" bald = 1 bodytype = "Heavy Machine" + mob_size = 12 unarmed_types = list(/datum/unarmed_attack/industrial) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 4d23dc141e1..3813fc9808c 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -266,6 +266,12 @@ icon_state = "lcasing" spent_icon = "lcasing-spent" +/obj/item/ammo_casing/slugger + projectile_type = /obj/item/projectile/bullet/rifle/slugger + caliber = "slugger" + icon_state = "slugger-sharp" + spent_icon = "slugger-spent" + /obj/item/ammo_casing/gauss name = "tungsten slug" desc = "A heavy tungsten gauss slug." diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm index 6f62c9eb959..e2a2eea4b0e 100644 --- a/code/modules/projectiles/guns/projectile/sniper.dm +++ b/code/modules/projectiles/guns/projectile/sniper.dm @@ -21,6 +21,7 @@ accuracy = -3 scoped_accuracy = 4 var/bolt_open = 0 + var/has_scope = TRUE is_wieldable = TRUE @@ -82,11 +83,66 @@ set name = "Use Scope" set popup_menu = 1 + if(!has_scope) + to_chat(usr, SPAN_WARNING("\The [src] doesn't have a scope!")) + return + if(wielded) toggle_scope(2.0, usr) else to_chat(usr, "You can't look through the scope without stabilizing the rifle!") +/obj/item/gun/projectile/heavysniper/unathi + name = "hegemony slugger" + desc = "An incredibly large firearm, produced by an Ouerean Guild. Uses custom slugger rounds." + icon = 'icons/obj/guns/unathi_slugger.dmi' + icon_state = "slugger" + item_state = "slugger" + origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 2, TECH_ILLEGAL = 4) + w_class = ITEMSIZE_HUGE + fire_sound = 'sound/effects/Explosion1.ogg' + caliber = "slugger" + ammo_type = /obj/item/ammo_casing/slugger + magazine_type = null + has_scope = FALSE + +/obj/item/gun/projectile/heavysniper/unathi/update_icon() + if(bolt_open && length(loaded)) + icon_state = "slugger-open-loaded" + else if(bolt_open && !length(loaded)) + icon_state = "slugger-open" + else + icon_state = "slugger" + if(wielded) + item_state = "slugger-wielded" + else + item_state = "slugger" + update_held_icon() + +/obj/item/gun/projectile/heavysniper/unathi/handle_post_fire(mob/user) + ..() + if(ishuman(user)) + var/mob/living/carbon/human/H = user + var/has_online_rig = H.wearing_rig && !H.wearing_rig.offline + if(H.mob_size < 10 && !has_online_rig) // smaller than an unathi + H.visible_message(SPAN_WARNING("\The [src] goes flying out of \the [H]'s hand!"), SPAN_WARNING("\The [src] flies out of your hand!")) + H.drop_item(src) + src.throw_at(get_edge_target_turf(src, reverse_dir[H.dir]), 3, 3) + + var/obj/item/organ/external/LH = H.get_organ(BP_L_HAND) + var/obj/item/organ/external/RH = H.get_organ(BP_R_HAND) + var/active_hand = H.hand + + if(active_hand) + LH.take_damage(30) + else + RH.take_damage(30) + +/obj/item/gun/projectile/heavysniper/unathi/getAmmo() + if(chambered) + return 1 + return 0 + /obj/item/gun/projectile/heavysniper/tranq name = "tranquilizer rifle" desc = "A nonlethal modification to the PTR-7 anti-materiel rifle meant for sedation and capture of the most dangerous of game. Fires .50 cal PPS shells that deploy a torpor inducing drug payload." diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 1373993056b..7a20b67d138 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -210,6 +210,24 @@ damage = 50 weaken = 1 +/obj/item/projectile/bullet/rifle/slugger + name = "slugger round" + damage = 80 + weaken = 3 + penetrating = 5 + armor_penetration = 15 + maiming = TRUE + maim_rate = 3 + maim_type = DROPLIMB_BLUNT + +/obj/item/projectile/bullet/rifle/slugger/on_hit(var/atom/movable/target, var/blocked = 0) + if(!istype(target)) + return FALSE + var/throwdir = get_dir(firer, target) + target.throw_at(get_edge_target_turf(target, throwdir), 3, 3) + ..() + return TRUE + /obj/item/projectile/bullet/rifle/tranq name = "dart" icon_state = "dart" @@ -375,4 +393,4 @@ mob.apply_effect(450, IRRADIATE) new /obj/effect/temp_visual/nuke(A.loc) explosion(A,2,5,9) - ..() \ No newline at end of file + ..() diff --git a/html/changelogs/geeves-kataphract_supplies.yml b/html/changelogs/geeves-kataphract_supplies.yml new file mode 100644 index 00000000000..8e76ea3c699 --- /dev/null +++ b/html/changelogs/geeves-kataphract_supplies.yml @@ -0,0 +1,8 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "The Kataphracts now spawn with a custom supply area in their preparation area." + - rscadd: "Added the Hegemony Slugger, a large rifle that only humanoid mobs of Unathi size and larger can safely operate." + - tweak: "Increased industrial IPC mob size to be able to fire this rifle, which has minor side effects like better headbutts." \ No newline at end of file diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 6dd3c95db7754f77f556561b941c1dbd11733188..01142ec364a402d195aee799706a7e525b73bea2 100644 GIT binary patch delta 12139 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 P^}t^`M%v|?k3#+zacF~S delta 11569 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 WNy#36z7G{f19#PR)k;(>U;hu5*YCIh diff --git a/icons/obj/guns/unathi_slugger.dmi b/icons/obj/guns/unathi_slugger.dmi new file mode 100644 index 0000000000000000000000000000000000000000..805b385b8df48b8764338dc03058dd753fa073b9 GIT binary patch literal 1777 zcmV%*i7)d`sR!B(z008#+ugc4;Tsu3QorJ)^z~3*dtpET30d!JM zQvg8b*k%9#0HJzRSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1ms0;jab#M`X1hiCU96#I<|9Y8 z{0${S3=9l9G4n3lZv~xs{w2FF#^vXS52alu?6Uj8;(SM}9m`SL^o!kT_XPFxxU$B6 zWtXW`n-JDftY%zt2u`-`t#&i-ZpZJeyV8E({28|iwL7Lda;iB`!RU?4qNBH3&Ah-9 zSe5p}>+7>*|Nci|6S9s7UZ}~soVoa<_2}~Sk*2oee6b^2z$xududgqX{r6vmEtZ^6 z8!OV39LwP#A*0&E^*@rx4$q7o(t|){bB^0N!EY<1Kt3e6SwVu(dFF=$=gAee$Rt*< z+FT-_Vgv`=lCkXC(VqlXdb$zzluvIrbdqfC%s(+?Pp7cU~+_3;}O23d0bTjot=XP4!MlRgN6tBwx+T3u@htQ z#r%4Y%i(Ewc7+z zw6=*_BFSSAZqxZM`N5dG$z_j$csa(!!8X--41@KxI!JUL0}(3+ogM}T1_nPaDwWdJ z5452E=jc%C{my=%?S5e%V`Pl_rQR3)0E&%d3GIhS?h2Sp6UwYm%R-D#k@G~-zoMy` zG+7wil+v`A#f>U73H4450ivZv=ez*MdI1S+kIhzhKIc3xToHnMq1y{J+erYT#%r;H z>KZIW$HKliSwmzO1c6$D5n~QXinW|5TA~pstRuR%x;vN>>Ks^@X2=OF5?)iuXytI>9+jAt3we>%N>Xy6vw3~pt zXWBk17S-ytsj8xCb(__=yQBKNO_fV5BBEA=kmssYF4ZkoW01@}D`R3&?IjBWMD6G5 z7OOGDqY@_~p4!_TqC|+=&($qfW67yKAoRYvC;?3E$9Ro3=!lr$Y9Fhy23@kgV_2=R z799~C!%B?}3=9km{)5=mNAh+o+vLh@yvdDmEz=5rZ+Z`N z&*^TxWL|YP^S@)Bvt9!KX~9zW10bGkZF`zKh!$&61&D5wpE-Znm(S0N6$t-B^+Zix0U=dC0OLW`eW{UY6n_3G$@A1secH5D z4%T8x9YS%DPfZe3u_+~A-sf&e1`8$cH~M=Cr5r)Vq7 zK5To4y3HWH>KUU%5X%HHQD8xWYw|+`trejE^5_dM*AmDAq+=)e4Fpjjy+TG4%xUs3 z5p0O8|54CTt~$P#jmNh2KbnQ^rIcfwV1shC^?wJ!&r&L!0RNh{^*;(0NY7`q1Q2cg zj}zF#2@w5{#I|;t`&?v9|0`JnDiKh0D?I3XtAGTf)~y1&+1YO(h+LTfds+Yod*AG6 z>k^??Y`}Y#1_lNO-y5HS=GW@~A+TJKR431WPy+Z5h7ssq!qtGzn@6@<{XYbjL=Ynm zZzQ1erUc(!|7S@VAo%9`pJcCsfD$E`$6NIO_aLyLLhmOHuLBL6tXlm)1owcTr+U5) zYw-Td`w-agOc0#j`635C_@U|a{}9kAyj5uQ{~&@R_@U|a{~*9t+~|LU{}=uNFbZ_J Tju^Y400000NkvXXu0mjflRZ+o literal 0 HcmV?d00001 diff --git a/maps/templates/distress/distress_equipment.dm b/maps/templates/distress/distress_equipment.dm index 1f63f2e4710..dcd86b80797 100644 --- a/maps/templates/distress/distress_equipment.dm +++ b/maps/templates/distress/distress_equipment.dm @@ -1,3 +1,7 @@ /datum/map_template/distress_iac name = "IAC distress equipment" - mappath = 'maps/templates/distress/iac.dmm' \ No newline at end of file + mappath = 'maps/templates/distress/iac.dmm' + +/datum/map_template/distress_kataphract + name = "kataphract distress equipment" + mappath = 'maps/templates/distress/kataphracts.dmm' \ No newline at end of file diff --git a/maps/templates/distress/kataphracts.dmm b/maps/templates/distress/kataphracts.dmm new file mode 100644 index 00000000000..47369b0121e --- /dev/null +++ b/maps/templates/distress/kataphracts.dmm @@ -0,0 +1,151 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/machinery/power/emitter, +/obj/effect/decal/warning_stripes, +/turf/unsimulated/floor{ + icon_state = "vault"; + dir = 5 + }, +/area/centcom/distress_prep) +"b" = ( +/turf/unsimulated/floor{ + icon_state = "vault"; + dir = 5 + }, +/area/centcom/distress_prep) +"c" = ( +/obj/structure/table/rack, +/obj/item/stack/material/steel{ + amount = 50 + }, +/obj/item/stack/material/plasteel{ + amount = 50; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/material/glass{ + amount = 50; + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/device/debugger{ + pixel_x = 2; + pixel_y = -5 + }, +/obj/item/device/debugger{ + pixel_y = -5 + }, +/obj/item/device/multitool{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/device/multitool{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/clothing/gloves/yellow/specialu, +/obj/item/clothing/gloves/yellow/specialu, +/turf/unsimulated/floor{ + icon_state = "vault"; + dir = 5 + }, +/area/centcom/distress_prep) +"d" = ( +/obj/structure/closet/crate/freezer{ + name = "rations" + }, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/reagent_containers/food/snacks/koisbar_clean, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/liquidfood, +/obj/item/reagent_containers/food/snacks/skrellsnacks, +/obj/item/reagent_containers/food/snacks/skrellsnacks, +/obj/item/reagent_containers/food/snacks/skrellsnacks, +/obj/item/reagent_containers/food/snacks/skrellsnacks, +/obj/item/reagent_containers/food/snacks/nathisnack, +/obj/item/reagent_containers/food/snacks/nathisnack, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/obj/item/reagent_containers/food/drinks/cans/waterbottle, +/turf/unsimulated/floor{ + icon_state = "platebot" + }, +/area/centcom/distress_prep) +"e" = ( +/obj/structure/table/rack, +/obj/item/gun/projectile/heavysniper/unathi{ + pixel_y = 4 + }, +/obj/item/ammo_casing/slugger, +/obj/item/ammo_casing/slugger, +/obj/item/ammo_casing/slugger, +/obj/item/device/binoculars{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/device/binoculars{ + pixel_x = 4; + pixel_y = -6 + }, +/turf/unsimulated/floor{ + icon_state = "platebot" + }, +/area/centcom/distress_prep) +"f" = ( +/obj/structure/table/rack, +/obj/item/storage/backpack/satchel/hegemony{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/storage/backpack/satchel/hegemony{ + pixel_x = 2; + pixel_y = -2 + }, +/turf/unsimulated/floor{ + icon_state = "platebot" + }, +/area/centcom/distress_prep) +"g" = ( +/mob/living/heavy_vehicle/premade/light/kataphract, +/turf/unsimulated/floor{ + icon_state = "platebot" + }, +/area/centcom/distress_prep) + +(1,1,1) = {" +a +c +d +"} +(2,1,1) = {" +b +b +e +"} +(3,1,1) = {" +b +b +f +"} +(4,1,1) = {" +b +b +g +"}