diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 57594d5567..0226d0bc66 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -229,8 +229,6 @@ if(occupant.radiation || occupant.accumulated_rads) occupant.radiation -= 25 occupant.accumulated_rads -= 25 - if(occupant.bloodstr.get_reagent_amount("prussian_blue") < 2) - occupant.bloodstr.add_reagent("prussian_blue",5) var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0 var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0 occupant.heal_organ_damage(heal_brute,heal_fire) diff --git a/code/game/objects/items/devices/personal_shield_generator_vr.dm b/code/game/objects/items/devices/personal_shield_generator_vr.dm index c09d7ae8c5..d6b63c4c41 100644 --- a/code/game/objects/items/devices/personal_shield_generator_vr.dm +++ b/code/game/objects/items/devices/personal_shield_generator_vr.dm @@ -17,7 +17,7 @@ name = "personal shield generator" desc = "A personal shield generator." icon = 'icons/obj/items_vr.dmi' - icon_state = "shield_pack" + icon_state = "shieldpack_basic" item_state = "defibunit" //Placeholder slot_flags = SLOT_BACK force = 5 @@ -460,8 +460,8 @@ /obj/item/device/personal_shield_generator/belt name = "personal shield generator" desc = "A personal shield generator." - icon_state = "shield_back_active" - item_state = "shield_pack" + icon_state = "shieldpack_basic" + item_state = "defibunit" w_class = ITEMSIZE_LARGE //No putting these in backpacks! slot_flags = SLOT_BELT has_weapon = 0 //No gun with the belt! diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index b037db4362..9a921ab260 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -622,5 +622,8 @@ var/list/flooring_types desc = "A flat area of concrete flooring." icon = 'icons/turf/concrete.dmi' icon_base = "concrete" - is_plating = TRUE - plating_type = /decl/flooring/concrete \ No newline at end of file + is_plating = FALSE //VOREStation edit. It's a lot cooler if it's actual tile. + can_paint = 1 //VOREStation edit. Let's allow for some fun. + can_engrave = 1 //VOREStation edit. Fun. + flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_REMOVE_CROWBAR + \ No newline at end of file diff --git a/code/game/turfs/simulated/outdoors/outdoors_vr.dm b/code/game/turfs/simulated/outdoors/outdoors_vr.dm index 48972b9f1e..536fea57c6 100644 --- a/code/game/turfs/simulated/outdoors/outdoors_vr.dm +++ b/code/game/turfs/simulated/outdoors/outdoors_vr.dm @@ -42,7 +42,7 @@ "dirt9" = 1 ) flooring_override = pickweight(possibledirts) - return ..() + return ..() /turf/simulated/floor/outdoors/newdirt_nograss @@ -62,7 +62,7 @@ "dirt9" = 1 ) flooring_override = pickweight(possibledirts) - return ..() + return ..() /turf/simulated/floor/outdoors/sidewalk name = "sidewalk" @@ -116,10 +116,10 @@ "[initial(icon_state)]7" = 2, "[initial(icon_state)]8" = 2, "[initial(icon_state)]9" = 2, - "[initial(icon_state)]10" = 2 + "[initial(icon_state)]10" = 2 ) flooring_override = pickweight(possibledirts) - return ..() + return ..() /turf/simulated/floor/outdoors/sidewalk/side icon_state = "side-walk" @@ -141,3 +141,18 @@ build_type = /obj/item/stack/tile/floor/sidewalk/slab /obj/item/stack/tile/floor/sidewalk/slab + +/obj/item/stack/tile/floor/concrete //Proper concrete tile. + name = "concrete tile" + singular_name = "floor tile" + desc = "A concrete tile fit for covering a section of floor." + icon_state = "tile" + force = 6.0 + matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 4) + throwforce = 15.0 + throw_speed = 5 + throw_range = 20 + no_variants = TRUE + +/decl/flooring/concrete + build_type = /obj/item/stack/tile/floor/concrete diff --git a/code/game/turfs/simulated/wall_types.dm b/code/game/turfs/simulated/wall_types.dm index 0884016ba6..183b3bffc3 100644 --- a/code/game/turfs/simulated/wall_types.dm +++ b/code/game/turfs/simulated/wall_types.dm @@ -83,6 +83,8 @@ material = MAT_CONCRETE icon_state = "brick" +/turf/simulated/wall/concrete/Initialize(mapload) + . = ..(mapload, "concrete") //3strong /turf/simulated/wall/r_concrete desc = "A sturdy wall made of concrete and reinforced with plasteel rebar" @@ -90,6 +92,9 @@ reinf_material = MAT_PLASTEELREBAR icon_state = "rbrick" +/turf/simulated/wall/r_concrete/Initialize(mapload) + . = ..(mapload, "concrete","plasteel rebar") //3strong + // Kind of wondering if this is going to bite me in the butt. /turf/simulated/wall/skipjack/Initialize(mapload) . = ..(mapload, "alienalloy") @@ -405,7 +410,7 @@ /turf/simulated/wall/eris/can_join_with_low_wall(var/obj/structure/low_wall/WF) return istype(WF, /obj/structure/low_wall/eris) - + /turf/simulated/wall/eris/special_wall_connections(list/dirs, list/inrange) ..() for(var/direction in cardinal) diff --git a/code/modules/materials/materials/stone.dm b/code/modules/materials/materials/stone.dm index 811e2e2ed9..486d812c87 100644 --- a/code/modules/materials/materials/stone.dm +++ b/code/modules/materials/materials/stone.dm @@ -39,7 +39,7 @@ icon_colour = "#9e9c99" weight = 20 hardness = 30 - integrity = 100 + integrity = 100 stack_type = /obj/item/stack/material/flint supply_conversion_value = 2 sheet_singular_name = "piece" @@ -63,6 +63,14 @@ /datum/material/stone/concrete/generate_recipes() ..() + recipes += list( + new /datum/stack_recipe_list("Concrete Pathing",list( + new /datum/stack_recipe("Concrete Flooring", /obj/item/stack/tile/floor/concrete, 1, 4, 20, recycle_material = "[name]"), + new /datum/stack_recipe("Concrete Sidewalk", /obj/item/stack/tile/floor/sidewalk, 1, 4, 20, recycle_material = "[name]"), + new /datum/stack_recipe("Concrete Sidewalk (Side)", /obj/item/stack/tile/floor/sidewalk/side, 1, 4, 20, recycle_material = "[name]"), + new /datum/stack_recipe("Concrete Sidewalk (Slab)", /obj/item/stack/tile/floor/sidewalk/slab, 1, 4, 20, recycle_material = "[name]") + )), + ) /datum/material/stone/concrete/New() . = ..() diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 4e0aafe0fd..42ce468bce 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi index ea1543413a..9c3cf31f09 100644 Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ