cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Titanium and plastitanium shards and weapons + missing textures. [MDB IGNORE] (#13457)

Browse Source 
* Titanium and plastitanium shards and weapons + missing textures.

* ew

Co-authored-by: Comxy <tijntensen@gmail.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-05-09 01:30:21 +01:00
committed by GitHub
co-authored by Comxy Gandalf
parent a9e6a5f50e
commit effc8fb75e
18 changed files with 134 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/decals/cleanable/misc.dm
+6
View File
@@ -48,6 +48,12 @@
/obj/effect/decal/cleanable/glass/plasma
icon_state = "plasmatiny"
/obj/effect/decal/cleanable/glass/titanium
icon_state = "titaniumtiny"
/obj/effect/decal/cleanable/glass/plastitanium
icon_state = "plastitaniumtiny"
/obj/effect/decal/cleanable/dirt
name = "dirt"
desc = "Someone should clean that up."
code/game/objects/effects/spawners/random/trash.dm
+1
View File
@@ -23,6 +23,7 @@
/obj/item/popsicle_stick = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/item/reagent_containers/food/drinks/sillycup = 1,
/obj/item/shard/plasma = 1,
)
/obj/effect/spawner/random/trash/cigbutt
code/game/objects/items/knives.dm
+35
View File
@@ -156,6 +156,41 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, FIRE = 0, ACID = 0)
custom_materials = list(/datum/material/glass=400)
/obj/item/knife/shiv/plasma
name = "plasma shiv"
icon_state = "plasmashiv"
inhand_icon_state = "plasmashiv"
desc = "A makeshift plasma glass shiv."
force = 9
throwforce = 13
armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
custom_materials = list(/datum/material/glass=400, /datum/material/plasma=200)
/obj/item/knife/shiv/titanium
name = "titanium shiv"
icon_state = "titaniumshiv"
inhand_icon_state = "titaniumshiv"
desc = "A makeshift titanium-infused glass shiv."
throwforce = 14
throw_range = 7
wound_bonus = 10
armor = list(MELEE = 25, BULLET = 25, LASER = 25, ENERGY = 25, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50)
custom_materials = list(/datum/material/glass=400, /datum/material/titanium=200)
/obj/item/knife/shiv/plastitanium
name = "plastitanium shiv"
icon_state = "plastitaniumshiv"
inhand_icon_state = "plastitaniumshiv"
desc = "A makeshift titanium-infused plasma glass shiv."
force = 10
throwforce = 15
throw_speed = 4
throw_range = 8
wound_bonus = 10
bare_wound_bonus = 20
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 0, FIRE = 75, ACID = 75)
custom_materials = list(/datum/material/glass=400, /datum/material/alloy/plastitanium=200)
/obj/item/knife/shiv/carrot
name = "carrot shiv"
icon_state = "carrotshiv"
code/game/objects/items/spear.dm
+18
View File
@@ -43,9 +43,27 @@
var/obj/item/shard/tip = locate() in parts_list
if(tip)
if (istype(tip, /obj/item/shard/plasma))
force = 11
throwforce = 21
icon_prefix = "spearplasma"
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
else if (istype(tip, /obj/item/shard/titanium))
force = 13
throwforce = 21
throw_range = 8
throw_speed = 5
wound_bonus = -10
icon_prefix = "speartitanium"
AddComponent(/datum/component/two_handed, force_unwielded=13, force_wielded=18, icon_wielded="[icon_prefix]1")
else if (istype(tip, /obj/item/shard/plastitanium))
force = 13
throwforce = 22
throw_range = 9
throw_speed = 5
wound_bonus = -10
bare_wound_bonus = 20
icon_prefix = "spearplastitanium"
AddComponent(/datum/component/two_handed, force_unwielded=13, force_wielded=20, icon_wielded="[icon_prefix]1")
update_appearance()
parts_list -= tip
qdel(tip)
code/game/objects/items/stacks/sheets/glass.dm
+54 -24
View File
@@ -1,4 +1,3 @@
/** SKYRAT EDIT - MODULARIZATION - SEE SKYRAT_MODULAR/MODULES/MATERIALS_GLASS
/* Glass stack types
* Contains:
* Glass sheets
@@ -16,7 +15,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
new/datum/stack_recipe("glass tile", /obj/item/stack/tile/glass, 1, 4, 20) \
))
/obj/item/stack/sheet/glass//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/stack/sheet/glass
name = "glass"
desc = "HOLY SHEET! That is a lot of glass."
singular_name = "glass sheet"
@@ -78,10 +77,10 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
GLOBAL_LIST_INIT(pglass_recipes, list ( \
new/datum/stack_recipe("directional window", /obj/structure/window/plasma/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile window", /obj/structure/window/plasma/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 0, on_floor = TRUE) \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 20, on_floor = TRUE) \
))
/obj/item/stack/sheet/plasmaglass//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/stack/sheet/plasmaglass
name = "plasma glass"
desc = "A glass sheet made out of a plasma-silicate alloy. It looks extremely tough and heavily fire resistant."
singular_name = "plasma glass sheet"
@@ -131,12 +130,12 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
null, \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("glass shard", /obj/item/shard, time = 0, on_floor = TRUE), \
new/datum/stack_recipe("glass shard", /obj/item/shard, time = 10, on_floor = TRUE), \
new/datum/stack_recipe("reinforced glass tile", /obj/item/stack/tile/rglass, 1, 4, 20) \
))
/obj/item/stack/sheet/rglass//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/stack/sheet/rglass
name = "reinforced glass"
desc = "Glass which seems to have rods or something stuck in them."
singular_name = "reinforced glass sheet"
@@ -185,10 +184,10 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
GLOBAL_LIST_INIT(prglass_recipes, list ( \
new/datum/stack_recipe("directional reinforced window", /obj/structure/window/reinforced/plasma/unanchored, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("fulltile reinforced window", /obj/structure/window/reinforced/plasma/fulltile/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 0, on_floor = TRUE) \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 40, on_floor = TRUE) \
))
/obj/item/stack/sheet/plasmarglass//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE
/obj/item/stack/sheet/plasmarglass
name = "reinforced plasma glass"
desc = "A glass sheet made out of a plasma-silicate alloy and a rod matrix. It looks hopelessly tough and nearly fire-proof!"
singular_name = "reinforced plasma glass sheet"
@@ -210,7 +209,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
GLOBAL_LIST_INIT(titaniumglass_recipes, list(
new/datum/stack_recipe("shuttle window", /obj/structure/window/reinforced/shuttle/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("glass shard", /obj/item/shard, time = 0, on_floor = TRUE) \
new/datum/stack_recipe("titanium glass shard", /obj/item/shard/titanium, time = 40, on_floor = TRUE) \
))
/obj/item/stack/sheet/titaniumglass
@@ -226,13 +225,15 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
merge_type = /obj/item/stack/sheet/titaniumglass
tableVariant = /obj/structure/table/reinforced/titaniumglass
/obj/item/stack/sheet/titaniumglass/fifty
amount = 50
/obj/item/stack/sheet/titaniumglass/get_main_recipes()
. = ..()
. += GLOB.titaniumglass_recipes
GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
new/datum/stack_recipe("plastitanium window", /obj/structure/window/reinforced/plasma/plastitanium/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE), \
new/datum/stack_recipe("plasma glass shard", /obj/item/shard/plasma, time = 0, on_floor = TRUE) \
new/datum/stack_recipe("plastitanium window", /obj/structure/window/reinforced/plasma/plastitanium/unanchored, 2, time = 0, on_floor = TRUE, window_checks = TRUE) \
))
/obj/item/stack/sheet/plastitaniumglass
@@ -273,6 +274,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
max_integrity = 40
sharpness = SHARP_EDGED
var/icon_prefix
var/shiv_type = /obj/item/knife/shiv
var/craft_time = 3.5 SECONDS
var/obj/item/stack/sheet/weld_material = /obj/item/stack/sheet/glass
embedding = list("embed_chance" = 65)
@@ -330,20 +333,20 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
to_chat(H, span_warning("[src] cuts into your hand!"))
H.apply_damage(force*0.5, BRUTE, hit_hand)
/obj/item/shard/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/lightreplacer))
var/obj/item/lightreplacer/L = I
L.attackby(src, user)
else if(istype(I, /obj/item/stack/sheet/cloth))
var/obj/item/stack/sheet/cloth/C = I
to_chat(user, span_notice("You begin to wrap the [C] around the [src]..."))
if(do_after(user, 35, target = src))
var/obj/item/knife/shiv/S = new /obj/item/knife/shiv
C.use(1)
to_chat(user, span_notice("You wrap the [C] around the [src] forming a makeshift weapon."))
/obj/item/shard/attackby(obj/item/item, mob/user, params)
if(istype(item, /obj/item/lightreplacer))
var/obj/item/lightreplacer/lightreplacer = item
lightreplacer.attackby(src, user)
else if(istype(item, /obj/item/stack/sheet/cloth))
var/obj/item/stack/sheet/cloth/cloth = item
to_chat(user, span_notice("You begin to wrap the [cloth] around the [src]..."))
if(do_after(user, craft_time, target = src))
var/obj/item/knife/shiv/shiv = new shiv_type
cloth.use(1)
to_chat(user, span_notice("You wrap the [cloth] around the [src], forming a makeshift weapon."))
remove_item_from_storage(src)
qdel(src)
user.put_in_hands(S)
user.put_in_hands(shiv)
else
return ..()
@@ -375,7 +378,34 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
force = 6
throwforce = 11
icon_state = "plasmalarge"
inhand_icon_state = "shard-plasma"
custom_materials = list(/datum/material/alloy/plasmaglass=MINERAL_MATERIAL_AMOUNT)
icon_prefix = "plasma"
weld_material = /obj/item/stack/sheet/plasmaglass
**/
shiv_type = /obj/item/knife/shiv/plasma
craft_time = 7 SECONDS
/obj/item/shard/titanium
name = "bright shard"
desc = "A nasty looking shard of titanium infused glass."
throwforce = 12
icon_state = "titaniumlarge"
inhand_icon_state = "shard-titanium"
custom_materials = list(/datum/material/alloy/titaniumglass=MINERAL_MATERIAL_AMOUNT)
icon_prefix = "titanium"
weld_material = /obj/item/stack/sheet/titaniumglass
shiv_type = /obj/item/knife/shiv/titanium
craft_time = 7 SECONDS
/obj/item/shard/plastitanium
name = "dark shard"
desc = "A nasty looking shard of titanium infused plasma glass."
force = 7
throwforce = 12
icon_state = "plastitaniumlarge"
inhand_icon_state = "shard-plastitanium"
custom_materials = list(/datum/material/alloy/plastitaniumglass=MINERAL_MATERIAL_AMOUNT)
icon_prefix = "plastitanium"
weld_material = /obj/item/stack/sheet/plastitaniumglass
shiv_type = /obj/item/knife/shiv/plastitanium
craft_time = 14 SECONDS
code/game/objects/structures/window.dm
+18
View File
@@ -687,6 +687,15 @@
glass_amount = 2
receive_ricochet_chance_mod = 1.2
/obj/structure/window/reinforced/shuttle/spawnDebris(location)
. = list()
. += new /obj/item/shard/titanium(location)
. += new /obj/effect/decal/cleanable/glass/titanium(location)
if (reinf)
. += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
if (fulltile)
. += new /obj/item/shard/titanium(location)
/obj/structure/window/reinforced/shuttle/narsie_act()
add_atom_colour("#3C3434", FIXED_COLOUR_PRIORITY)
@@ -718,6 +727,15 @@
glass_amount = 2
rad_insulation = RAD_HEAVY_INSULATION
/obj/structure/window/reinforced/plasma/plastitanium/spawnDebris(location)
. = list()
. += new /obj/item/shard/plastitanium(location)
. += new /obj/effect/decal/cleanable/glass/plastitanium(location)
if (reinf)
. += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
if (fulltile)
. += new /obj/item/shard/plastitanium(location)
/obj/structure/window/reinforced/plasma/plastitanium/unanchored
anchored = FALSE
state = WINDOW_OUT_OF_FRAME