mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
RnD & Cat fixes (#1913)
changes: bugfix: "Fixed an issue where some objects could not be deconstructed with RnD." bugfix: "Helmet lights now actually display the powered-on sprite." bugfix: "Cats on heads no longer magically turn invisible." bugfix: "Cyborgs' portable destructive analyzer can no longer steal intercoms or the captain's safe." imageadd: "Duffle (duffel?) bags now have in-hand sprites." Fixes #1158 Fixes #1662
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
/obj/item/weapon/circuitboard/holodeckcontrol
|
||||
name = T_BOARD("holodeck control console")
|
||||
build_path = /obj/machinery/computer/HolodeckControl
|
||||
origin_tech = "programming=2;bluespace=2"
|
||||
origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 2)
|
||||
var/last_to_emag
|
||||
var/linkedholodeck_area
|
||||
var/list/supported_programs
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
edge = 1
|
||||
force_divisor = 0.15 // 9 when wielded with hardness 60 (steel)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 12000)
|
||||
origin_tech = "materials=1"
|
||||
origin_tech = list(TECH_MATERIAL = 1)
|
||||
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
unbreakable = 1
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
w_class = 2
|
||||
sharp = 1
|
||||
edge = 1
|
||||
origin_tech = "materials=2;combat=1"
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
|
||||
attack_verb = list("chopped", "torn", "cut")
|
||||
applies_material_colour = 0
|
||||
|
||||
@@ -61,5 +61,5 @@
|
||||
throw_range = 3
|
||||
w_class = 4
|
||||
slot_flags = SLOT_BACK
|
||||
origin_tech = "materials=2;combat=2"
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
|
||||
attack_verb = list("chopped", "sliced", "cut", "reaped")
|
||||
|
||||
@@ -329,11 +329,19 @@
|
||||
name = "duffel bag"
|
||||
desc = "A spacious duffel bag."
|
||||
icon_state = "duffel-norm"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle",
|
||||
slot_r_hand_str = "duffle"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/cap
|
||||
name = "captain's duffel bag"
|
||||
desc = "A rare and special duffel bag for only the most air-headed of Nanotrasen personnel."
|
||||
icon_state = "duffel-captain"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_captain",
|
||||
slot_r_hand_str = "duffle_captain"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/hyd
|
||||
name = "botanist's duffel bag"
|
||||
@@ -344,16 +352,28 @@
|
||||
name = "virology duffel bag"
|
||||
desc = "A sterilized duffel bag suited to those about to unleash pathogenic havoc upon the world."
|
||||
icon_state = "duffel-virology"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_med",
|
||||
slot_r_hand_str = "duffle_med"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/med
|
||||
name = "medical duffel bag"
|
||||
desc = "A sterilized duffel bag for the young, upcoming lesbayan."
|
||||
icon_state = "duffel-medical"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_med",
|
||||
slot_r_hand_str = "duffle_med"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/eng
|
||||
name = "industrial duffel bag"
|
||||
desc = "A rough and tumble duffel bag for the hard working wrench-monkey of tomorrow."
|
||||
icon_state = "duffel-engineering"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_eng",
|
||||
slot_r_hand_str = "duffle_eng"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/tox
|
||||
name = "scientist's duffel bag"
|
||||
@@ -374,11 +394,19 @@
|
||||
name = "chemistry duffel bag"
|
||||
desc = "Spice up the love life a little."
|
||||
icon_state = "duffel-chemistry"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_med",
|
||||
slot_r_hand_str = "duffle_med"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/syndie
|
||||
name = "syndicate duffel bag"
|
||||
desc = "A snazzy black and red duffel bag, perfect for smuggling C4 and Parapens."
|
||||
icon_state = "duffel-syndie"
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "duffle_syndie",
|
||||
slot_r_hand_str = "duffle_syndie"
|
||||
)
|
||||
|
||||
/obj/item/weapon/storage/backpack/duffel/wizard
|
||||
name = "wizardly duffel bag"
|
||||
|
||||
@@ -208,7 +208,7 @@
|
||||
item_state = "stunrod"
|
||||
force = 20
|
||||
baton_color = "#75ACFF"
|
||||
origin_tech = "combat=4,illegal=2"
|
||||
origin_tech = list(TECH_COMBAT = 4, TECH_ILLEGAL = 2)
|
||||
contained_sprite = 1
|
||||
|
||||
/obj/item/weapon/melee/baton/stunrod/New()
|
||||
|
||||
@@ -166,7 +166,7 @@
|
||||
desc = "A welding tool with an extended-capacity built-in fuel tank, standard issue for engineers."
|
||||
max_fuel = 40
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 60)
|
||||
origin_tech = "engineering=2"
|
||||
origin_tech = list(TECH_ENGINEERING = 2)
|
||||
base_iconstate = "ind_welder"
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
max_fuel = 80
|
||||
w_class = 2.0
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 120)
|
||||
origin_tech = "engineering=3"
|
||||
origin_tech = list(TECH_ENGINEERING = 3)
|
||||
base_iconstate = "adv_welder"
|
||||
|
||||
|
||||
@@ -187,7 +187,7 @@
|
||||
max_fuel = 40
|
||||
w_class = 2.0
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 120)
|
||||
origin_tech = "engineering=4;biotech=4"
|
||||
origin_tech = list(TECH_ENGINEERING = 4, TECH_BIO = 4)
|
||||
base_iconstate = "exp_welder"
|
||||
base_itemstate = "exp_welder"
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
desc = "A mechanically activated leg trap. Low-tech, but reliable. Looks like it could really hurt if you set it off."
|
||||
throwforce = 0
|
||||
w_class = 3
|
||||
origin_tech = "materials=1"
|
||||
origin_tech = list(TECH_MATERIAL = 1)
|
||||
matter = list(DEFAULT_WALL_MATERIAL = 18750)
|
||||
var/deployed = 0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user