hull/glass replacement, further polish, other misc tweaks

also adds plastitanium hull components for later use
This commit is contained in:
Killian
2020-09-08 06:34:44 +01:00
parent bdaadc5726
commit eb8ecaddb2
7 changed files with 314 additions and 243 deletions

View File

@@ -63,4 +63,5 @@
#define MAT_TITANIUMGLASS "ti-glass" #define MAT_TITANIUMGLASS "ti-glass"
#define MAT_PLASTITANIUM "plastitanium" #define MAT_PLASTITANIUM "plastitanium"
#define MAT_PLASTITANIUMHULL "plastitanium hull"
#define MAT_PLASTITANIUMGLASS "plastitanium glass" #define MAT_PLASTITANIUMGLASS "plastitanium glass"

View File

@@ -1,6 +1,6 @@
//ert wardrobe override, because these guys really don't need edgy red lockers with CCO dress uniforms, syndi(!!) turtlenecks, two edgy skull bandanas, or facemasks with no sprite. -Killian //ert wardrobe override, because these guys really don't need edgy red lockers with CCO dress uniforms, syndi(!!) turtlenecks, two edgy skull bandanas, or facemasks with no sprite. -Killian
/obj/structure/closet/wardrobe/ert /obj/structure/closet/wardrobe/ert
closet_appearance = /decl/closet_appearance/tactical //because ert lockers are red for some dumb reason closet_appearance = /decl/closet_appearance/tactical/alt //because ert lockers are red for some dumb reason
starts_with = list( starts_with = list(
/obj/item/clothing/under/ert, /obj/item/clothing/under/ert,
/obj/item/device/radio/headset/ert/alt, /obj/item/device/radio/headset/ert/alt,
@@ -13,7 +13,7 @@
//would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian //would you believe mercs have no official locker? well, now they do. basically just a rebranded ERT locker but hey, it's an option. -Killian
/obj/structure/closet/wardrobe/merc /obj/structure/closet/wardrobe/merc
name = "mercenary equipment" name = "mercenary equipment"
closet_appearance = /decl/closet_appearance/ert //because ert lockers are red for some dumb reason closet_appearance = /decl/closet_appearance/tactical
starts_with = list( starts_with = list(
/obj/item/clothing/under/tactical, /obj/item/clothing/under/tactical,

View File

@@ -83,3 +83,15 @@ var/list/flesh_overlay_cache = list()
icon = 'icons/turf/wall_masks_vr.dmi' icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/plastitanium/Initialize(mapload) /turf/simulated/wall/plastitanium/Initialize(mapload)
. = ..(mapload, MAT_PLASTITANIUM, null,MAT_PLASTITANIUM) . = ..(mapload, MAT_PLASTITANIUM, null,MAT_PLASTITANIUM)
/turf/simulated/wall/rplastihull
icon_state = "rhull-plastitanium"
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/rplastihull/Initialize(mapload)
. = ..(mapload, MAT_PLASTITANIUMHULL,MAT_PLASTITANIUMHULL,MAT_PLASTITANIUMHULL)
/turf/simulated/wall/plastihull
icon_state = "hull-plastitanium"
icon = 'icons/turf/wall_masks_vr.dmi'
/turf/simulated/wall/plastihull/Initialize(mapload)
. = ..(mapload, MAT_PLASTITANIUMHULL, null,MAT_PLASTITANIUMHULL)

View File

@@ -21,7 +21,7 @@
type_to_spawn = /obj/item/stack/material/glass/titanium type_to_spawn = /obj/item/stack/material/glass/titanium
/obj/item/stack/material/plastitanium /obj/item/stack/material/plastitanium
name = "plas-tanium sheets" name = "plastitanium sheets"
icon = 'icons/obj/stacks_vr.dmi' icon = 'icons/obj/stacks_vr.dmi'
icon_state = "sheet-plastitanium" icon_state = "sheet-plastitanium"
item_state = "sheet-silver" item_state = "sheet-silver"
@@ -32,8 +32,20 @@
name = "stack of plastitanium" name = "stack of plastitanium"
type_to_spawn = /obj/item/stack/material/plastitanium type_to_spawn = /obj/item/stack/material/plastitanium
/obj/item/stack/material/plastitanium/hull
name = "plastitanium hull sheets"
icon = 'icons/obj/stacks_vr.dmi'
icon_state = "sheet-plastitanium"
item_state = "sheet-silver"
no_variants = FALSE
default_type = MAT_PLASTITANIUMHULL
/obj/fiftyspawner/plastitanium_hull
name = "stack of plastitanium"
type_to_spawn = /obj/item/stack/material/plastitanium/hull
/obj/item/stack/material/glass/plastitanium /obj/item/stack/material/glass/plastitanium
name = "plas-tanium glass sheets" name = "plastitanium glass sheets"
icon = 'icons/obj/stacks_vr.dmi' icon = 'icons/obj/stacks_vr.dmi'
icon_state = "sheet-plastitaniumglass" icon_state = "sheet-plastitaniumglass"
item_state = "sheet-silver" item_state = "sheet-silver"

View File

@@ -65,6 +65,17 @@
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT) composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
supply_conversion_value = 8 supply_conversion_value = 8
/material/plastitanium/hull
name = MAT_PLASTITANIUMHULL
stack_type = /obj/item/stack/material/plastitanium/hull
icon_base = "hull"
icon_reinf = "reinf_mesh"
icon_colour = "#585658"
explosion_resistance = 50
/material/plastitanium/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets.
new /obj/item/stack/material/plastitanium(target)
/material/glass/plastaniumglass /material/glass/plastaniumglass
name = MAT_PLASTITANIUMGLASS name = MAT_PLASTITANIUMGLASS
display_name = "plas-titanium glass" display_name = "plas-titanium glass"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 409 B

File diff suppressed because it is too large Load Diff