mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 05:23:22 +01:00
New clothing for Ta Consulars and Zo'ra Blaster changes (#15921)
* Create vaurca_flag_suit.dmi * Update head.dmi * Clothing changes * fix * Update unathi.dm * fix the guns * delete I * Fix K'lax * firearm * further fixes * gunkit * Update gunkit.dm * Delete gunkit.dm * gun buff * changes * Update unathi.dm * Update special.dm * Gun change * thermic * blaster fluff and CL * CL update * damage test * 35 damage * Update special.dm * recoil test * delete extra sprite-sheet * Fix undocumented change
This commit is contained in:
@@ -42,20 +42,21 @@
|
||||
/obj/item/storage/box/tcfl_pamphlet = 1,
|
||||
/obj/item/device/versebook/biesel = 1, //constitution
|
||||
/obj/item/stamp/biesel = 1,
|
||||
/obj/item/gun/energy/blaster/revolver = 1
|
||||
)
|
||||
|
||||
/datum/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
|
||||
if(H && !visualsOnly)
|
||||
if(isvaurca(H))
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder(H), slot_head)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/biesel(H), slot_head)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder(H), slot_shoes)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder(H), slot_wear_suit)
|
||||
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
|
||||
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_belt)
|
||||
else
|
||||
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
|
||||
H.equip_to_slot_or_del(new /obj/item/gun/energy/blaster/revolver(H), slot_belt)
|
||||
return TRUE
|
||||
|
||||
/datum/citizenship/sol_alliance
|
||||
|
||||
@@ -28,7 +28,6 @@
|
||||
SPECIES_VAURCA_WORKER,
|
||||
SPECIES_VAURCA_WARRIOR,
|
||||
SPECIES_VAURCA_BULWARK,
|
||||
SPECIES_VAURCA_BREEDER
|
||||
)
|
||||
)
|
||||
|
||||
@@ -64,7 +63,6 @@
|
||||
name = "Izweski Hegemony Consular Officer"
|
||||
|
||||
uniform = /obj/item/clothing/under/unathi
|
||||
suit = /obj/item/clothing/accessory/poncho/unathimantle
|
||||
backpack_contents = list(/obj/item/device/camera = 1)
|
||||
belt = /obj/item/gun/energy/pistol/hegemony
|
||||
|
||||
@@ -72,11 +70,12 @@
|
||||
if(H && !visualsOnly)
|
||||
if(isvaurca(H))
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/under/gearharness(H), slot_w_uniform)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/klax(H), slot_head)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/head/vaurca_breeder/hegemony(H), slot_head)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/vaurca/breeder/klax(H), slot_shoes)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vaurca/filter(H), slot_wear_mask)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/suit/vaurca/breeder/klax(H), slot_wear_suit)
|
||||
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec/klax(H), slot_back)
|
||||
else
|
||||
addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
|
||||
H.equip_to_slot_or_del(new /obj/item/clothing/accessory/poncho/unathimantle(H), slot_wear_suit)
|
||||
return TRUE
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
|
||||
H.equip_to_slot_or_del(new /obj/item/storage/backpack/typec(H), slot_back)
|
||||
H.equip_to_slot_or_del(new /obj/item/storage/box/tcfl_pamphlet(H), slot_in_backpack)
|
||||
H.equip_to_slot_or_del(new /obj/item/gun/energy/vaurca/blaster(H), slot_in_backpack)
|
||||
|
||||
addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
|
||||
return TRUE
|
||||
|
||||
@@ -22,6 +22,18 @@
|
||||
|
||||
/obj/item/clothing/head/vaurca_breeder/nralakk
|
||||
name = "nralakk representative shroud"
|
||||
desc = "Large shroud used by Nralakk representatives."
|
||||
desc = "Large shroud used by C'thur Nralakk representatives."
|
||||
item_state = "hive_rep_shroud_nralakk"
|
||||
icon_state = "hive_rep_shroud_nralakk"
|
||||
|
||||
/obj/item/clothing/head/vaurca_breeder/biesel
|
||||
name = "biesel representative shroud"
|
||||
desc = "Large shroud used by Zo'ra Republic of Biesel representatives."
|
||||
item_state = "hive_rep_shroud_biesel"
|
||||
icon_state = "hive_rep_shroud_biesel"
|
||||
|
||||
/obj/item/clothing/head/vaurca_breeder/hegemony
|
||||
name = "hegemony representative shroud"
|
||||
desc = "Large shroud used by K'lax Izweski Hegemony representatives."
|
||||
item_state = "hive_rep_shroud_hegemony"
|
||||
icon_state = "hive_rep_shroud_hegemony"
|
||||
|
||||
@@ -266,30 +266,30 @@
|
||||
return ..()
|
||||
|
||||
/obj/item/gun/energy/vaurca/blaster
|
||||
name = "\improper Zo'ra Blaster"
|
||||
desc = "An elegant weapon for a more civilized time."
|
||||
name = "\improper thermic blaster"
|
||||
desc = "Designed after the Zo'ra arrival in the Spur, this modern reimagining of the venerable Zo'rane Thermic Blaster is as much a rare and brutal personal defense weapon as it is a badge of office for the Zo'ra Ta that now wield it. \
|
||||
The design blends visual elements from a revolver, chosen by the Hive for its status as a respected weapon throughout much of the Spur, with the might of Zo'rane energy technology."
|
||||
desc_extended = "The Thermic Blaster, sometimes known as the Zo'ra Blaster, is an incendiary energy weapon capable of tearing through any would-be interloper, though the phoron-powered battery is held back by an unremarkable capacity. \
|
||||
While the blaster's smaller battery may cause problems in longer engagements, its intended use as the sidearm of Zo'ra Diplomats and certain Warriors makes it a low priority to increase given the already remarkably steep cost of the design."
|
||||
icon = 'icons/obj/guns/blaster.dmi'
|
||||
icon_state = "blaster"
|
||||
item_state = "blaster"
|
||||
has_item_ratio = FALSE
|
||||
origin_tech = list(TECH_COMBAT = 2, TECH_PHORON = 4)
|
||||
origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_POWER = 4)
|
||||
fire_sound = 'sound/weapons/laser1.ogg'
|
||||
slot_flags = SLOT_BACK | SLOT_HOLSTER | SLOT_BELT
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
accuracy = 1
|
||||
recoil = 1
|
||||
force = 10
|
||||
projectile_type = /obj/item/projectile/energy/blaster/incendiary
|
||||
max_shots = 7
|
||||
sel_mode = 1
|
||||
burst = 1
|
||||
burst_delay = 1
|
||||
fire_delay = 0
|
||||
fire_delay = 5
|
||||
can_turret = 1
|
||||
turret_sprite_set = "laser"
|
||||
firemodes = list(
|
||||
list(mode_name="single shot", burst=1, burst_delay = 1, fire_delay = 0),
|
||||
list(mode_name="concentrated burst", burst=3, burst_delay = 1, fire_delay = 5)
|
||||
)
|
||||
|
||||
|
||||
/obj/item/gun/energy/vaurca/typec
|
||||
name = "thermal lance"
|
||||
|
||||
@@ -209,6 +209,6 @@
|
||||
|
||||
/obj/item/projectile/energy/blaster/incendiary
|
||||
icon_state = "laser"
|
||||
damage = 30
|
||||
armor_penetration = 10
|
||||
incinerate = 4
|
||||
damage = 35
|
||||
armor_penetration = 60
|
||||
incinerate = 15
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
################################
|
||||
# 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: Connorjg1
|
||||
|
||||
# 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: "Zo'ra and K'lax Ta now have new Republic of Biesel and Izweski Hegemony clothing."
|
||||
- bugfix: "K'lax Ta can now spawn as Hegemony Consular's without being told they are species ineligible."
|
||||
- balance: "Zo'ra Blaster has been renamed to Thermic Blaster and changed. The burst mode has been removed and a firing delay added, however the round itself now does more damage, has better AP and has a longer lasting incendiary effect."
|
||||
- rscadd: "Zo'ra Consulars are now equipped with the newly renamed Zo'ra Blaster, the Thermic Blaster."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.0 KiB After Width: | Height: | Size: 8.2 KiB |
Reference in New Issue
Block a user