From ab8b9f08c915c9c3dcccc5306b031c4a34649b29 Mon Sep 17 00:00:00 2001 From: Yipper Yapper Date: Wed, 28 Jul 2021 20:27:34 -0700 Subject: [PATCH] Import part two. added alt click to rotate and added to cargo packs. --- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/structures/micro_bricks.dm | 38 +++++++++--------- code/modules/cargo/packs/misc.dm | 7 ++++ icons/obj/stack_objects.dmi | Bin 44198 -> 44320 bytes 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index cfa63463..3f21577e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -919,7 +919,7 @@ GLOBAL_LIST_INIT(micro_bricks_recipes, list ( \ new/datum/stack_recipe("Small warehouse", /obj/structure/micro_brick/small_warehouse, 5, time = 2, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("Small museum", /obj/structure/micro_brick/small_museum, 5, time = 2, one_per_turf = TRUE, on_floor = TRUE), \ null, \ - new/datum/stack_recipe("Small moon", /obj/item/micro_brick/moon, 5, time = 2), \ + new/datum/stack_recipe("Small moon", /obj/item/moon, 5, time = 2), \ null, \ )) diff --git a/code/game/objects/structures/micro_bricks.dm b/code/game/objects/structures/micro_bricks.dm index 3d3543ee..af3bc2a7 100644 --- a/code/game/objects/structures/micro_bricks.dm +++ b/code/game/objects/structures/micro_bricks.dm @@ -1,72 +1,66 @@ /obj/structure/micro_brick icon = 'icons/obj/small_world.dmi' + anchored = FALSE + var/buildstacktype = /obj/item/stack/sheet/micro_bricks + +/obj/structure/micro_brick/ComponentInitialize() + . = ..() + AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE) /obj/structure/micro_brick/road_fourway name = "Road fourway" desc = "roundabouts are better!" icon_state = "roadfourway" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/road_threeway name = "Road threeway" desc = "Ill take the back you get the front." icon_state = "roadthreeway" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/road_straight name = "Road straight" desc = "Is it gay if the balls touch?" icon_state = "roadstraight" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 - /obj/structure/micro_brick/Road_turn name = "Road turn" desc = "Bending the Rules." //i cannot find a joke for this :( icon_state = "roadturn" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/small_house name = "Small houses" desc = "Lets hope this household does their taxes!" icon_state = "smallhouses" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/small_business name = "Small business" desc = "A place for not many 9's with how many 5's" icon_state = "smallbusiness" - anchored = TRUE + var/rotation_flags = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/small_warehouse @@ -74,25 +68,21 @@ desc = "The house has been exposed to the moon light and is now a warehouse!" // https://i.redd.it/4ke5819c2ib61.jpg icon_state = "warehouse" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 /obj/structure/micro_brick/small_museum name = "Small museum" desc = "A place to store old and small relics found around the station " icon_state = "smallmuseum" - anchored = TRUE resistance_flags = FLAMMABLE max_integrity = 100 integrity_failure = 30 - var/buildstacktype = /obj/item/stack/sheet/metal var/buildstackamount = 2 -/obj/item/micro_brick/moon +/obj/item/moon name = "Small moon" icon_state = "smallmoon" icon = 'icons/obj/small_world.dmi' @@ -101,4 +91,14 @@ throw_speed = 3 throw_range = 7 force = 0 - total_mass = TOTAL_MASS_TINY_ITEM \ No newline at end of file + 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/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 81463d2e..bb50395e 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -429,3 +429,10 @@ desc = "An extremely expensive solution of shrinking serum known as Diminicillin. Effects are permanent upon consumption, and shrinking is slow." cost = 100000 contains = list(/obj/item/reagent_containers/food/drinks/diminicillin) + +/datum/supply_pack/misc/microbricks + name = "Microbricks Crate" + desc = "Extremely bored? Recreate a downscale city and get upset when it all comes crumbling down!" + cost = 1500 + contains = list(/obj/item/stack/sheet/micro_bricks/fifty) + crate_name = "microbricks crate" \ No newline at end of file diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index bc5367c12ba8aaa8443a45299996014b390db832..b6214612c7a6b3429bcad51250dfbe5bdb8396cd 100644 GIT binary patch delta 3765 zcmV;m4odN+*#e;20+1vD{jnwI0v>pJ%-&;x74Fj~*LZ23ULVcl%X9S))b&#H¬| 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 M07*qoM6N<$f?a9!LI3~&