Merge pull request #8994 from KillianKirilenko/kk-adminships

ERT & Mercenary Ship Remodels
This commit is contained in:
Novacat
2020-09-27 17:21:14 -04:00
committed by GitHub
15 changed files with 61958 additions and 3734 deletions
+14 -2
View File
@@ -21,7 +21,7 @@
type_to_spawn = /obj/item/stack/material/glass/titanium
/obj/item/stack/material/plastitanium
name = "plas-tanium sheets"
name = "plastitanium sheets"
icon = 'icons/obj/stacks_vr.dmi'
icon_state = "sheet-plastitanium"
item_state = "sheet-silver"
@@ -32,8 +32,20 @@
name = "stack of 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
name = "plas-tanium glass sheets"
name = "plastitanium glass sheets"
icon = 'icons/obj/stacks_vr.dmi'
icon_state = "sheet-plastitaniumglass"
item_state = "sheet-silver"
+11
View File
@@ -65,6 +65,17 @@
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
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
name = MAT_PLASTITANIUMGLASS
display_name = "plas-titanium glass"