diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 55e9bb77..cf563314 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -716,8 +716,12 @@ GLOBAL_LIST_INIT(plastic_recipes, list( new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \ new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \ new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \ - new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\ - new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2))) + new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50), \ + new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2), \ + null, \ + new /datum/stack_recipe("micro bricks", /obj/item/stack/sheet/micro_bricks, 1, 5, 15,), \ + +)) /obj/item/stack/sheet/plastic name = "plastic" diff --git a/code/game/objects/structures/micro_bricks.dm b/code/game/objects/structures/micro_bricks.dm index af3bc2a7..1617304b 100644 --- a/code/game/objects/structures/micro_bricks.dm +++ b/code/game/objects/structures/micro_bricks.dm @@ -4,9 +4,44 @@ var/buildstacktype = /obj/item/stack/sheet/micro_bricks /obj/structure/micro_brick/ComponentInitialize() - . = ..() - AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE) + . = ..() + AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE) +/obj/structure/micro_brick/Initialize() + . = ..() + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + +/obj/structure/micro_brick/proc/on_attackby(datum/source, obj/item/item, mob/user, params) + if(try_crush_microbricks(user)) + return TRUE + + if(istype(item, /obj/item/carpentry/glue)) + to_chat(user,"You glue the bricks to the floor.") + anchored = TRUE + return TRUE + + if(istype(item, /obj/item/crowbar)) + to_chat(user,"You pry the bricks from the floor.") + anchored = FALSE + return TRUE + + //probably could better, but im busy playing warframe rn to help Summer lmao -Dahl + // Moved it to the top, MERP! Also... i CHANGED THE CODE. Side note, AAAAAAA! -Summer + +/obj/structure/micro_brick/proc/on_attack_hand(datum/source, mob/user, list/modifiers) + return try_crush_microbricks(user) + +/obj/structure/micro_brick/proc/try_crush_microbricks(mob/stomper) + if(stomper.a_intent != INTENT_HARM) + return FALSE + to_chat(stomper, "You crush the microbrick structure, what a monster!") + + playsound(src, pick('sound/effects/bricks_1.ogg', 'sound/effects/bricks_2.ogg'), 30, 0) + //I Stepped on these legos that i bought. and it hurts :( -Summer + qdel(src) + return TRUE + /obj/structure/micro_brick/road_fourway name = "Road fourway" desc = "roundabouts are better!" @@ -23,7 +58,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 1 /obj/structure/micro_brick/road_straight name = "Road straight" @@ -32,7 +67,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 1 /obj/structure/micro_brick/Road_turn name = "Road turn" @@ -42,7 +77,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 1 /obj/structure/micro_brick/small_house name = "Small houses" @@ -51,7 +86,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 5 /obj/structure/micro_brick/small_business name = "Small business" @@ -61,7 +96,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 5 /obj/structure/micro_brick/small_warehouse name = "Small warehouse" @@ -71,7 +106,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 5 /obj/structure/micro_brick/small_museum name = "Small museum" @@ -80,7 +115,7 @@ resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstackamount = 2 + var/buildstackamount = 5 /obj/item/moon name = "Small moon" @@ -92,13 +127,3 @@ throw_range = 7 force = 0 total_mass = TOTAL_MASS_TINY_ITEM - -/obj/structure/micro_brick/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/carpentry/glue)) - to_chat(user,"You glue the bricks to the floor.") - anchored = TRUE - if(istype(I, /obj/item/crowbar)) - to_chat(user,"You pry the bricks from the floor.") - anchored = FALSE - //probably could better, but im busy playing warframe rn to help Summer lmao -Dahl - // Merp -Summer \ No newline at end of file diff --git a/sound/effects/bricks_1.ogg b/sound/effects/bricks_1.ogg new file mode 100644 index 00000000..4d1dc379 Binary files /dev/null and b/sound/effects/bricks_1.ogg differ diff --git a/sound/effects/bricks_2.ogg b/sound/effects/bricks_2.ogg new file mode 100644 index 00000000..29d55411 Binary files /dev/null and b/sound/effects/bricks_2.ogg differ