mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-01-03 22:12:38 +00: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:
@@ -466,7 +466,7 @@ var/list/name_to_material
|
||||
tableslam_noise = 'sound/effects/Glasshit.ogg'
|
||||
hardness = 40
|
||||
weight = 30
|
||||
stack_origin_tech = "materials=2"
|
||||
stack_origin_tech = list(TECH_MATERIAL = 2)
|
||||
composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
|
||||
window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5)
|
||||
created_window = /obj/structure/window/reinforced
|
||||
|
||||
@@ -355,19 +355,17 @@ var/list/holder_mob_icon_cache = list()
|
||||
desc_dead = "It used to be a little plant critter."
|
||||
icon_state = "nymph"
|
||||
icon_state_dead = "nymph_dead"
|
||||
origin_tech = "magnets=3;biotech=5"
|
||||
origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5)
|
||||
slot_flags = SLOT_HEAD | SLOT_OCLOTHING
|
||||
w_class = 2
|
||||
|
||||
|
||||
|
||||
|
||||
/obj/item/weapon/holder/drone
|
||||
name = "maintenance drone"
|
||||
desc = "It's a small maintenance robot."
|
||||
icon_state = "drone"
|
||||
item_state = "drone"
|
||||
origin_tech = "magnets=3;engineering=5"
|
||||
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
|
||||
slot_flags = SLOT_HEAD
|
||||
w_class = 4
|
||||
contained_sprite = 1
|
||||
@@ -410,7 +408,7 @@ var/list/holder_mob_icon_cache = list()
|
||||
name = "cortical borer"
|
||||
desc = "It's a slimy brain slug. Gross."
|
||||
icon_state = "brainslug"
|
||||
origin_tech = "biotech=6"
|
||||
origin_tech = list(TECH_BIO = 6)
|
||||
w_class = 1
|
||||
|
||||
/obj/item/weapon/holder/monkey
|
||||
@@ -457,7 +455,7 @@ var/list/holder_mob_icon_cache = list()
|
||||
icon_state_dead = "mouse_brown_dead"
|
||||
slot_flags = SLOT_EARS
|
||||
contained_sprite = 1
|
||||
origin_tech = "biotech=2"
|
||||
origin_tech = list(TECH_BIO = 2)
|
||||
w_class = 1
|
||||
|
||||
/obj/item/weapon/holder/mouse/white
|
||||
|
||||
@@ -779,8 +779,9 @@ var/global/list/damage_icon_parts = list()
|
||||
|
||||
if(istype(head,/obj/item/clothing/head))
|
||||
var/obj/item/clothing/head/hat = head
|
||||
if(hat.on && light_overlay_cache["[hat.light_overlay]"])
|
||||
standing.overlays |= light_overlay_cache["[hat.light_overlay]"]
|
||||
var/cache_key = "[hat.light_overlay]_[species.get_bodytype()]"
|
||||
if(hat.on && light_overlay_cache["[cache_key]"])
|
||||
standing.overlays |= light_overlay_cache["[cache_key]"]
|
||||
|
||||
standing.color = head.color
|
||||
overlays_standing[HEAD_LAYER] = standing
|
||||
|
||||
@@ -90,7 +90,10 @@
|
||||
user << "Your [src] already has something inside. Analyze or eject it first."
|
||||
return
|
||||
var/obj/item/I = target
|
||||
I.loc = src
|
||||
if (I.anchored)
|
||||
user << span("notice", "\The [I] is anchored in place.")
|
||||
return
|
||||
I.forceMove(src)
|
||||
loaded_item = I
|
||||
for(var/mob/M in viewers())
|
||||
M.show_message(text("<span class='notice'>[user] adds the [I] to the [src].</span>"), 1)
|
||||
|
||||
@@ -111,7 +111,7 @@
|
||||
* Parapens
|
||||
*/
|
||||
/obj/item/weapon/pen/reagent/paralysis
|
||||
origin_tech = "materials=2;syndicate=5"
|
||||
origin_tech = list(TECH_MATERIAL = 2, TECH_ILLEGAL = 5)
|
||||
|
||||
/obj/item/weapon/pen/reagent/paralysis/New()
|
||||
..()
|
||||
|
||||
@@ -373,7 +373,7 @@
|
||||
icon = 'icons/obj/vaurca_items.dmi'
|
||||
icon_state = "thermaldrill"
|
||||
item_state = "thermaldrill"
|
||||
origin_tech = "combat=6;phorontech=8,"
|
||||
origin_tech = list(TECH_COMBAT = 6, TECH_PHORON = 8)
|
||||
fire_sound = 'sound/magic/lightningbolt.ogg'
|
||||
slot_flags = SLOT_BACK
|
||||
w_class = 4
|
||||
|
||||
@@ -77,7 +77,7 @@
|
||||
magazine_type = /obj/item/ammo_magazine/t40
|
||||
allowed_magazines = list(/obj/item/ammo_magazine/t40)
|
||||
caliber = "10mm"
|
||||
origin_tech = "combat=3;materials=2"
|
||||
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2)
|
||||
fire_sound = 'sound/weapons/Gunshot_light.ogg'
|
||||
load_method = MAGAZINE
|
||||
sel_mode = 1
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "bluespace_crystal"
|
||||
w_class = 1
|
||||
origin_tech = "bluespace=4;materials=3"
|
||||
origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 3)
|
||||
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
|
||||
|
||||
|
||||
@@ -42,5 +42,5 @@
|
||||
/obj/item/bluespace_crystal/artificial
|
||||
name = "artificial bluespace crystal"
|
||||
desc = "An artificially made bluespace crystal, it looks delicate."
|
||||
origin_tech = "bluespace=2"
|
||||
origin_tech = list(TECH_BLUESPACE = 2)
|
||||
blink_range = 4 // Not as good as the organic stuff!
|
||||
|
||||
@@ -6,7 +6,7 @@ var/list/GPS_list = list()
|
||||
icon_state = "gps-c"
|
||||
w_class = 2
|
||||
slot_flags = SLOT_BELT
|
||||
origin_tech = "programming=2;engineering=2"
|
||||
origin_tech = list(TECH_DATA = 2, TECH_ENGINEERING = 2)
|
||||
var/gpstag = "COM0"
|
||||
var/emped = 0
|
||||
var/turf/locked_location
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
icon = 'icons/obj/radio.dmi'
|
||||
icon_state = "beacon"
|
||||
item_state = "signaler"
|
||||
origin_tech = "bluespace=3"
|
||||
origin_tech = list(TECH_BLUESPACE = 3)
|
||||
|
||||
/obj/item/device/telepad_beacon/attack_self(mob/user)
|
||||
if(user)
|
||||
|
||||
Reference in New Issue
Block a user