mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-25 22:12:58 +01:00
Merge branch 'master' into development
This commit is contained in:
skull132
@@ -42,3 +42,14 @@
|
||||
antag_contest_side = ANTI_SYNTH
|
||||
else
|
||||
antag_contest_side = 0
|
||||
|
||||
|
||||
/mob/living/carbon/human/proc/implant_loyalty_sol(mob/living/carbon/human/M, override = FALSE) // Won't override by default.
|
||||
|
||||
var/obj/item/weapon/implant/loyalty/sol/L = new/obj/item/weapon/implant/loyalty/sol(M)
|
||||
L.imp_in = M
|
||||
L.implanted = 1
|
||||
var/obj/item/organ/external/affected = M.organs_by_name["head"]
|
||||
affected.implants += L
|
||||
L.part = affected
|
||||
L.implanted(src)
|
||||
@@ -0,0 +1,299 @@
|
||||
/*
|
||||
* Sol Alliance military related items
|
||||
*/
|
||||
|
||||
|
||||
/obj/item/weapon/implant/loyalty/sol
|
||||
name = "loyalty implant"
|
||||
desc = "Makes you loyal to the Sol Alliance, or to a certain individual."
|
||||
|
||||
/obj/item/weapon/implant/loyalty/sol/implanted(mob/M)
|
||||
if(!istype(M, /mob/living/carbon/human)) return 0
|
||||
var/mob/living/carbon/human/H = M
|
||||
var/datum/antagonist/antag_data = get_antag_data(H.mind.special_role)
|
||||
if(antag_data && (antag_data.flags & ANTAG_IMPLANT_IMMUNE))
|
||||
H.visible_message("[H] seems to resist the implant!", "You feel the tendrils of the Sol Alliance try to invade your mind!")
|
||||
return 0
|
||||
else
|
||||
clear_antag_roles(H.mind, 1)
|
||||
H << "<span class='notice'>You feel a surge of loyalty towards Admiral Michael Frost.</span>"
|
||||
return 1
|
||||
|
||||
|
||||
//sol uniforms
|
||||
|
||||
/obj/item/clothing/under/rank/fatigues //regular sol navy combat fatigues
|
||||
name = "sol navy fatigues"
|
||||
desc = "Military looking uniform issued to Sol Alliance navy, to be used while in the field."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "sol_uniform"
|
||||
item_state = "sol_uniform"
|
||||
contained_sprite = 1
|
||||
armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/under/rank/fatigues/marine //regular sol navy marine fatigues
|
||||
name = "sol marine fatigues"
|
||||
desc = "Military looking uniform issued to Sol Alliance marines, to be used while in the field."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "marine_fatigue"
|
||||
item_state = "marine_fatigue"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/service //navy personnel service unniform
|
||||
name = "sol navy service uniform"
|
||||
desc = "Military looking service uniform issued to Sol Alliance navy members."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whiteservice"
|
||||
item_state = "whiteservice"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/service/marine //sol marine service unniform
|
||||
name = "sol marine service uniform"
|
||||
desc = "Military looking service uniform issued to Sol Alliance marines."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "tanutility"
|
||||
item_state = "tanutility"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress //navy personnel dress unniform
|
||||
name = "sol navy dress uniform"
|
||||
desc = "A fancy military looking dress uniform issued to Sol Alliance navy members."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "sailor"
|
||||
item_state = "sailor"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/marine //sol marine dress unniform
|
||||
name = "sol marine dress uniform"
|
||||
desc = "A fancy military looking dress uniform issued to Sol Alliance marine."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "mahreendress"
|
||||
item_state = "mahreendress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/officer //sol marine officer dress unniform
|
||||
name = "sol navy commander dress uniform"
|
||||
desc = "A fancy military looking dress uniform issued to high ranking Sol Alliance navy officers. This one wears the rank of Commander"
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "dress"
|
||||
item_state = "dress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/subofficer //sol marine officer dress unniform
|
||||
name = "sol navy lieutenant dress uniform"
|
||||
desc = "A fancy military looking dress uniform issued to lower ranking Sol Alliance navy officers. This one wears the rank of Lieutenant"
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "subdress"
|
||||
item_state = "subdress"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/under/rank/dress/admiral //admiral uniform
|
||||
name = "sol navy admiral uniform"
|
||||
desc = "A fancy military dress uniform issued to a higher member of the Sol Alliance navy."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "admiral_uniform"
|
||||
item_state = "admiral_uniform"
|
||||
contained_sprite = 1
|
||||
|
||||
//hats
|
||||
|
||||
/obj/item/clothing/head/navy
|
||||
name = "sol navy utility cover"
|
||||
desc = "An eight pointed cover issued to Sol Alliance navy members as part of their field uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "greyutility"
|
||||
item_state = "greyutility"
|
||||
contained_sprite = 1
|
||||
armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
|
||||
|
||||
/obj/item/clothing/head/navy/marine
|
||||
name = "sol marine utility cover"
|
||||
desc = "An eight pointed cover issued to Sol Alliance marines as part of their field uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "greenutility"
|
||||
item_state = "greenutility"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/navy/garrison
|
||||
name = "sol marine garrison cap"
|
||||
desc = "A green garrison cap issued to Sol Alliance marines."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "greengarrisoncap"
|
||||
item_state = "greengarrisoncap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress
|
||||
name = "sol navy dress cap"
|
||||
desc = "A white cap issued as part of the Sol Alliance navy dress uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitepeakcap"
|
||||
item_state = "whitepeakcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/marine
|
||||
name = "sol marine dress cap"
|
||||
desc = "A green cap issued as part of the Sol Alliance marine dress uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitepeakcap"
|
||||
item_state = "whitepeakcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/officer
|
||||
name = "sol navy officer dress cap"
|
||||
desc = "A white cap issued as part of the Sol Alliance navy officers dress uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "whitewheelcap"
|
||||
item_state = "whitewheelcap"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/dress/admiral
|
||||
name = "sol navy admiral dress cap"
|
||||
desc = "A fancy looking cap issued to a higher member of the Sol Alliance navy."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "admiral_cap"
|
||||
item_state = "admiral_cap"
|
||||
contained_sprite = 1
|
||||
|
||||
//ceremonial swords
|
||||
|
||||
/obj/item/weapon/melee/ceremonial_sword
|
||||
name = "sol officer ceremonial sword"
|
||||
desc = "A ceremonial sword issued to Sol navy officers as part of their dress uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "officersword"
|
||||
item_state = "officersword"
|
||||
contained_sprite = 1
|
||||
flags = CONDUCT
|
||||
slot_flags = SLOT_BELT
|
||||
force = 15
|
||||
throwforce = 5
|
||||
w_class = 4
|
||||
sharp = 1
|
||||
edge = 1
|
||||
can_embed = 0
|
||||
origin_tech = list(TECH_COMBAT = 4)
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
|
||||
/obj/item/weapon/melee/ceremonial_sword/marine
|
||||
name = "sol marine ceremonial sword"
|
||||
desc = "A ceremonial sword issued to Sol marine officers as part of their dress uniform."
|
||||
icon = 'icons/obj/sol_uniform.dmi'
|
||||
icon_state = "marineofficersword"
|
||||
item_state = "marineofficersword"
|
||||
contained_sprite = 1
|
||||
|
||||
//closet uniform
|
||||
|
||||
/obj/structure/closet/sol
|
||||
name = "sol navy uniform closet"
|
||||
desc = "It's a storage unit for Sol Alliance navy uniforms."
|
||||
icon_state = "syndicate1"
|
||||
icon_closed = "syndicate1"
|
||||
icon_opened = "syndicate1open"
|
||||
|
||||
/obj/structure/closet/sol/navy/New()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/fatigues(src)
|
||||
new /obj/item/clothing/under/rank/fatigues(src)
|
||||
new /obj/item/clothing/under/rank/fatigues(src)
|
||||
new /obj/item/clothing/under/rank/service(src)
|
||||
new /obj/item/clothing/under/rank/service(src)
|
||||
new /obj/item/clothing/under/rank/service(src)
|
||||
new /obj/item/clothing/head/navy(src)
|
||||
new /obj/item/clothing/head/navy(src)
|
||||
new /obj/item/clothing/head/navy(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
|
||||
/obj/structure/closet/sol/marine
|
||||
name = "sol marines uniform closet"
|
||||
desc = "It's a storage unit for Sol Alliance marine uniforms."
|
||||
|
||||
/obj/structure/closet/sol/marine/New()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/fatigues/marine(src)
|
||||
new /obj/item/clothing/under/rank/fatigues/marine(src)
|
||||
new /obj/item/clothing/under/rank/fatigues/marine(src)
|
||||
new /obj/item/clothing/under/rank/service/marine(src)
|
||||
new /obj/item/clothing/under/rank/service/marine(src)
|
||||
new /obj/item/clothing/under/rank/service/marine(src)
|
||||
new /obj/item/clothing/head/navy/marine(src)
|
||||
new /obj/item/clothing/head/navy/marine(src)
|
||||
new /obj/item/clothing/head/navy/garrison(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
|
||||
/obj/structure/closet/sol/navy_dress
|
||||
name = "sol navy dress uniform closet"
|
||||
desc = "It's a storage unit for Sol Alliance navy dress uniforms."
|
||||
|
||||
/obj/structure/closet/sol/navy_dress/New()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/dress(src)
|
||||
new /obj/item/clothing/under/rank/dress(src)
|
||||
new /obj/item/clothing/under/rank/dress(src)
|
||||
new /obj/item/clothing/head/dress(src)
|
||||
new /obj/item/clothing/head/dress(src)
|
||||
new /obj/item/clothing/head/dress(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
|
||||
/obj/structure/closet/sol/marine_dress
|
||||
name = "sol marine dress uniform closet"
|
||||
desc = "It's a storage unit for Sol Alliance marine dress uniforms."
|
||||
|
||||
/obj/structure/closet/sol/marine_dress/New()
|
||||
..()
|
||||
new /obj/item/clothing/under/rank/dress/marine(src)
|
||||
new /obj/item/clothing/under/rank/dress/marine(src)
|
||||
new /obj/item/clothing/under/rank/dress/marine(src)
|
||||
new /obj/item/clothing/head/dress/marine(src)
|
||||
new /obj/item/clothing/head/dress/marine(src)
|
||||
new /obj/item/clothing/head/dress/marine(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/soll_officer
|
||||
name = "sol alliance officer locker"
|
||||
req_access = list(access_captain)
|
||||
icon_state = "capsecure1"
|
||||
icon_closed = "capsecure"
|
||||
icon_locked = "capsecure1"
|
||||
icon_opened = "capsecureopen"
|
||||
icon_broken = "capsecurebroken"
|
||||
icon_off = "capsecureoff"
|
||||
|
||||
/obj/structure/closet/secure_closet/soll_officer/New()
|
||||
..()
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/storage/backpack/captain(src)
|
||||
else
|
||||
new /obj/item/weapon/storage/backpack/satchel_cap(src)
|
||||
new /obj/item/clothing/under/rank/dress/officer(src)
|
||||
new /obj/item/clothing/head/dress/officer(src)
|
||||
new /obj/item/clothing/suit/storage/vest(src)
|
||||
new /obj/item/weapon/cartridge/captain(src)
|
||||
new /obj/item/clothing/head/helmet(src)
|
||||
new /obj/item/clothing/shoes/laceup(src)
|
||||
new /obj/item/device/radio/headset/heads/captain(src)
|
||||
new /obj/item/clothing/gloves/white(src)
|
||||
new /obj/item/weapon/gun/energy/pistol(src)
|
||||
new /obj/item/device/flash(src)
|
||||
new /obj/item/weapon/melee/telebaton(src)
|
||||
new /obj/item/weapon/melee/ceremonial_sword(src)
|
||||
new /obj/item/clothing/under/rank/fatigues(src)
|
||||
new /obj/item/clothing/under/rank/service(src)
|
||||
new /obj/item/clothing/shoes/jackboots(src)
|
||||
new /obj/item/clothing/accessory/holster/armpit(src)
|
||||
return
|
||||
@@ -194,11 +194,6 @@
|
||||
|
||||
return
|
||||
|
||||
// Antag contest shit
|
||||
if (href_list["contest_action"] && config.antag_contest_enabled)
|
||||
src.process_contest_topic(href_list)
|
||||
return
|
||||
|
||||
..() //redirect to hsrc.()
|
||||
|
||||
/client/proc/handle_spam_prevention(var/message, var/mute_type)
|
||||
|
||||
@@ -188,6 +188,7 @@
|
||||
flags_inv |= HIDEEYES
|
||||
body_parts_covered |= EYES
|
||||
icon_state = initial(icon_state)
|
||||
item_state = initial(item_state)
|
||||
flash_protection = initial(flash_protection)
|
||||
tint = initial(tint)
|
||||
usr << "You flip \the [src] down to protect your eyes."
|
||||
@@ -196,6 +197,7 @@
|
||||
flags_inv &= ~HIDEEYES
|
||||
body_parts_covered &= ~EYES
|
||||
icon_state = "[initial(icon_state)]up"
|
||||
item_state = "[initial(item_state)]up"
|
||||
flash_protection = FLASH_PROTECTION_NONE
|
||||
tint = TINT_NONE
|
||||
usr << "You push \the [src] up out of your face."
|
||||
|
||||
@@ -165,7 +165,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
|
||||
/obj/item/weapon/melee/fluff/tina_knife //Consecrated Athame - Tina Kaekel - tainavaa
|
||||
name = "consecrated athame"
|
||||
desc = "An athame used in occult rituals. The double-edged dagger is dull. The handle is black with a pink/white occult design strewn about it, and 'Tina' is inscribed into it in decorated letters."
|
||||
desc = "An athame used in occult rituals. The double-edged dagger is dull. The handle is black with a pink/white occult design strewn about it, and \"Tina\" is inscribed into it in decorated letters."
|
||||
icon = 'icons/obj/custom_items/tina_knife.dmi'
|
||||
icon_state = "tina_knife"
|
||||
item_state = "knife"
|
||||
@@ -178,7 +178,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
name = "\"Hephaestus Industrial Exosuit MK III\" APLU customisation kit"
|
||||
desc = "A ripley APLU model manufactured by Hephaestus industries, a common sight in New Gibson nowadays. It shines with chrome painting and a fancy reinforced glass cockpit."
|
||||
new_name = "Hephaestus Industrial Exosuit MK III"
|
||||
new_desc = "An ripley APLU model manufactured by Hephaestus industries, a common sight in New Gibson nowadays. It shines with chrome painting and a fancy reinforced glass cockpit."
|
||||
new_desc = "A ripley APLU model manufactured by Hephaestus industries, a common sight in New Gibson nowadays. It shines with chrome painting and a fancy reinforced glass cockpit."
|
||||
new_icon = "ripley_zairjah" //a lot of thanks to cakeisossim for the sprites
|
||||
allowed_types = list("ripley","firefighter")
|
||||
|
||||
@@ -406,14 +406,6 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
desc = "A NT Asset Protection Force Beret. It has the NT APF insignia on it as well as the Name \"Goellstein\" inside."
|
||||
|
||||
|
||||
/obj/item/clothing/accessory/armband/fluff/vittorio_armband //ATLAS Armband - Vittorio Giurifiglio - tytostyris
|
||||
name = "ATLAS armband"
|
||||
desc = "This is an atlas armband showing anyone who sees this person, as a member of the Political party Atlas."
|
||||
icon = 'icons/obj/custom_items/vittorio_armband.dmi'
|
||||
icon_state = "vittorio_armband"
|
||||
item_state = "vittorio_armband"
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/clothing/head/fluff/vittorio_fez //Black Fez - Vittorio Giurifiglio - tytostyris
|
||||
name = "black fez"
|
||||
desc = "It is a black fez, it bears an Emblem of the Astronomical symbol of Earth, It also has some nice tassels."
|
||||
@@ -480,7 +472,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/barcia_flask //First Shot - Gabriel Barcia - mrgabol100
|
||||
name = "first shot"
|
||||
desc = "A flask. Smells of absinthe, maybe vodka. The bottom left corner has a silver bar. \"The bottom is engraved, it reads 'The First Shot\"."
|
||||
desc = "A flask. Smells of absinthe, maybe vodka. The bottom left corner has a silver bar. The bottom is engraved, it reads: \"The First Shot\"."
|
||||
icon = 'icons/obj/custom_items/barcia_flask.dmi'
|
||||
icon_state = "barcia_flask"
|
||||
|
||||
@@ -497,6 +489,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
gender = NEUTER
|
||||
body_parts_covered = null
|
||||
|
||||
|
||||
/obj/item/clothing/under/dress/fluff/sayyidah_dress //Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk
|
||||
name = "traditional jumper dress"
|
||||
desc = "A light summer-time dress, decorated neatly with black and silver colors, it seems to be rather old."
|
||||
@@ -552,7 +545,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
user.visible_message("<span class='danger'>[user] thrust the [src.name] into [M]'s face.</span>")
|
||||
|
||||
|
||||
/obj/item/weapon/fluff/akela_photo // Akela's Family Photo - Akela Ha'kim - moltenkore
|
||||
/obj/item/weapon/fluff/akela_photo //Akela's Family Photo - Akela Ha'kim - moltenkore
|
||||
name = "family photo"
|
||||
desc = "You see on the photo a tajaran couple holding a small kit in their arms, while looking very happy. On the back it is written; \"Nasir, Akela and Ishka\", with a little gold mark that reads: \"Two months\"."
|
||||
icon = 'icons/obj/custom_items/akela_photo.dmi'
|
||||
@@ -856,7 +849,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
|
||||
|
||||
/obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth
|
||||
name = "LR-31MTA Beret"
|
||||
name = "LR-31MTA beret"
|
||||
desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \
|
||||
Along the top half of the ring \"LR-31MTA\" is engraved. The word \"Yam'hir\" is engraved along the bottom half of the ring. \
|
||||
The beret looks old and is worn in some places around the edges. It appears to have a flap inside, \
|
||||
@@ -939,7 +932,7 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
var/licensed_systems = "Republic of Biesel, Sol Alliance, Nralakk"
|
||||
var/supplementary_endorsements = "Licensed Medical Examiner; Sol Alliance, Republic of Biesel - Concealed firearm carry; Sol Alliance, Republic of Biesel"
|
||||
var/citizenship = "Republic of Biesel"
|
||||
|
||||
|
||||
/obj/item/clothing/accessory/badge/fluff/bell_badge/verb/read()
|
||||
set name = "Review credentials"
|
||||
set category = "Object"
|
||||
@@ -953,3 +946,65 @@ All custom items with worn sprites must follow the contained sprite system: http
|
||||
usr << "The systems that the credentials show the user is licensed to investigate in are [licensed_systems]."
|
||||
usr << "Additional endorsements registered on the card show: [supplementary_endorsements]."
|
||||
return
|
||||
|
||||
|
||||
/obj/item/clothing/head/beret/engineering/fluff/karlan_beret //Family Beret - Kar'lan Sel'ler - toasterstrudes
|
||||
name = "family beret"
|
||||
desc = "A brown beret with an orange patch. The patch have the initials; \"K.S.\" sewn into it."
|
||||
icon = 'icons/obj/custom_items/karlan_beret.dmi'
|
||||
icon_state = "karlan_beret"
|
||||
item_state = "karlan_beret"
|
||||
contained_sprite = 1
|
||||
|
||||
|
||||
/obj/item/clothing/under/fluff/guskov_uniform //Tajaran Service Uniform - Guskov Andrei - fireandglory
|
||||
name = "tajaran service uniform"
|
||||
desc = "This is obviously a military service uniform, there are signs that it is of Tajaran make, modified to be a bit less warm, although it doesn't look like any uniform used by the People's Republic of Adhomai."
|
||||
icon = 'icons/obj/custom_items/guskov_uniform.dmi'
|
||||
icon_state = "guskov_uniform"
|
||||
item_state = "guskov_uniform"
|
||||
contained_sprite = 1
|
||||
|
||||
|
||||
/obj/item/weapon/fluff/zhilin_book //Siik'maas-Tau Ceti Basic Dictionary - Zhilin Vadim - fireandglory
|
||||
name = "siik'maas-tau ceti basic dictionary"
|
||||
desc = "A hefty dictionary with a simple design on the cover, it seems to be for translations. There's a label on the back denoting that it belongs to a \"Zhilin Vadim\"."
|
||||
icon = 'icons/obj/custom_items/zhilin_book.dmi'
|
||||
icon_state = "zhilin_book"
|
||||
w_class = 3
|
||||
|
||||
/obj/item/weapon/fluff/zhilin_book/attack_self(mob/user as mob)
|
||||
user.visible_message("<span class='notice'>[user] starts flipping through \the [src].</span>",
|
||||
"<span class='notice'>You start looking through \the [src], it appears to be filled with translations of Tau-Ceti basic for tajaran users.</span>",
|
||||
"<span class='notice'>You hear pages being flipped.</span>")
|
||||
playsound(src.loc, "pageturn", 50, 1)
|
||||
|
||||
|
||||
/obj/item/clothing/suit/storage/toggle/fluff/fay_jacket //Emergency Response Team Duty Jacket - Fai Sinsa - soundscopes
|
||||
name = "emergency response team duty jacket"
|
||||
desc = "A militaristic duty jacket worn by members of the NanoTrasen Emergency Response Teams. The nameplate reads: \"Tpr Sinsa\"."
|
||||
icon = 'icons/obj/custom_items/fai_jacket.dmi'
|
||||
icon_state = "fai_jacket"
|
||||
item_state = "fai_jacket"
|
||||
icon_open = "fai_jacket_open"
|
||||
icon_closed = "fai_jacket"
|
||||
contained_sprite = 1
|
||||
|
||||
|
||||
/obj/item/clothing/under/fluff/faysal_uniform //Old Tajaran Nobleman Suit - Faysal Al-Shennawi - alberyk
|
||||
name = "old tajaran nobleman suit"
|
||||
desc = "A fancy looking suit, made of white line, adorned with golden details and buttons bearing long forgotten meanings. A blue sash decorates this piece of clothing."
|
||||
icon = 'icons/obj/custom_items/faysal_uniform.dmi'
|
||||
icon_state = "faysal_uniform"
|
||||
item_state = "faysal_uniform"
|
||||
contained_sprite = 1
|
||||
|
||||
|
||||
/obj/item/clothing/glasses/welding/fluff/ghoz_eyes //Prosthetic Vaurca Eyelids - Ka'Akaix'Ghoz Zo'ra - sleepywolf
|
||||
name = "prosthetic vaurca eyelids"
|
||||
desc = "A small contraption of micro-actuators with a button on the side."
|
||||
icon = 'icons/obj/custom_items/ghoz_eyes.dmi'
|
||||
icon_state = "ghoz_eyes"
|
||||
item_state = "ghoz_eyes"
|
||||
contained_sprite = 1
|
||||
action_button_name = "Toggle Eyelids"
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
user.visible_message("<span class='notice'>[user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>", \
|
||||
"<span class='notice'>You open the maintenance hatch on [target]'s [affected.name] with \the [tool].</span>")
|
||||
affected.open = 2
|
||||
affected.open = 3
|
||||
|
||||
fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
@@ -134,7 +134,7 @@
|
||||
var/obj/item/weapon/weldingtool/welder = tool
|
||||
if(!welder.isOn() || !welder.remove_fuel(1,user))
|
||||
return 0
|
||||
return affected && affected.open == 2 && affected.brute_dam > 0 && target_zone != "mouth"
|
||||
return affected && affected.open == 3 && affected.brute_dam > 0 && target_zone != "mouth"
|
||||
|
||||
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
@@ -166,7 +166,7 @@
|
||||
if(..())
|
||||
var/obj/item/stack/cable_coil/C = tool
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
var/limb_can_operate = (affected && affected.open == 2 && affected.burn_dam > 0 && target_zone != "mouth")
|
||||
var/limb_can_operate = (affected && affected.open == 3 && affected.burn_dam > 0 && target_zone != "mouth")
|
||||
if(limb_can_operate)
|
||||
if(istype(C))
|
||||
if(!C.get_amount() >= 3)
|
||||
@@ -197,7 +197,7 @@
|
||||
/datum/surgery_step/robotics/fix_organ_robotic //For artificial organs
|
||||
allowed_tools = list(
|
||||
/obj/item/stack/nanopaste = 100,
|
||||
/obj/item/weapon/bonegel = 30,
|
||||
/obj/item/weapon/bonegel = 30,
|
||||
/obj/item/weapon/screwdriver = 70
|
||||
)
|
||||
|
||||
@@ -215,7 +215,7 @@
|
||||
if(I.damage > 0 && I.robotic >= 2)
|
||||
is_organ_damaged = 1
|
||||
break
|
||||
return affected.open == 2 && is_organ_damaged
|
||||
return affected.open == 3 && is_organ_damaged
|
||||
|
||||
begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool)
|
||||
|
||||
@@ -375,7 +375,7 @@
|
||||
|
||||
var/obj/item/device/mmi/M = tool
|
||||
var/obj/item/organ/external/affected = target.get_organ(target_zone)
|
||||
if(!(affected && affected.open == 2))
|
||||
if(!(affected && affected.open == 3))
|
||||
return 0
|
||||
|
||||
if(!istype(M))
|
||||
|
||||
Reference in New Issue
Block a user