diff --git a/code/WorkInProgress/mining.dm b/code/WorkInProgress/mining.dm index 4d1de47c356..f270ec1aa1f 100644 --- a/code/WorkInProgress/mining.dm +++ b/code/WorkInProgress/mining.dm @@ -2527,6 +2527,16 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( throw_range = 3 origin_tech = "materials=5" +/obj/item/stack/sheet/enruranium + name = "Enriched Uranium block" + icon_state = "sheet-enruranium" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=5" + /obj/item/stack/sheet/plasma name = "solid plasma" icon_state = "sheet-plasma" diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index cc92e2bf311..e8643988e0f 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/maps/tgstation.2.0.3.dmm b/maps/tgstation.2.0.3.dmm index fca5ff21fdc..9f3751d4961 100644 --- a/maps/tgstation.2.0.3.dmm +++ b/maps/tgstation.2.0.3.dmm @@ -4776,7 +4776,7 @@ "bNR" = (/obj/machinery/atmospherics/pipe/simple{color = "blue"; icon_state = "intact-b-f"; level = 1; name = "pipe"},/turf/simulated/wall/r_wall,/area/crew_quarters/hor) "bNS" = (/obj/table{icon_state = "tabledir"; dir = 1},/obj/item/weapon/paper_bin,/obj/item/weapon/stamp/rd,/obj/item/device/radio/intercom{pixel_y = -30},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) "bNT" = (/obj/table{icon_state = "tabledir"; dir = 1},/obj/item/weapon/circuitboard/aicore,/obj/item/device/taperecorder,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) -"bNU" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/clipboard,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) +"bNU" = (/obj/table{dir = 5; icon_state = "tabledir"},/obj/item/weapon/clipboard,/obj/item/weapon/book/manual/research_and_development,/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) "bNV" = (/obj/machinery/disposal,/obj/disposalpipe/trunk,/obj/machinery/alarm{dir = 1; frequency = 1445; icon_state = "alarm0"; pixel_y = -22; sensors = list("tox_main_scrub_1" = "Toxin Lab Scrubber #1", "tox_main_scrub_2" = "Toxin Lab Scrubber #2", "tox_storage_scrub" = "Toxin Storage Scrubber", "tox_chem_scrub" = "Toxin Chemical Lab Scrubber")},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) "bNW" = (/obj/machinery/light,/obj/cable,/obj/machinery/power/apc{name = "RD's Office APC"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) "bNX" = (/obj/secure_closet/RD{pixel_x = 5},/turf/simulated/floor{icon_state = "white"},/area/crew_quarters/hor) @@ -5094,8 +5094,8 @@ "bTX" = (/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/obj/machinery/atmospherics/pipe/simple,/turf/simulated/wall,/area/engine/chiefs_office) "bTY" = (/obj/machinery/computer/atmos_alert,/obj/cable{icon_state = "0-2"; d2 = 2},/obj/cable{d2 = 8; icon_state = "0-8"},/obj/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor,/area/engine/chiefs_office) "bTZ" = (/obj/machinery/light{dir = 1},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/chiefs_office) -"bUa" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/table,/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 3; pixel_y = 3},/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/book/manual/engineering_guide{pixel_x = -3; pixel_y = -3},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/chiefs_office) -"bUb" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/turf/simulated/floor,/area/engine/chiefs_office) +"bUa" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_pump{dir = 1; on = 1},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/obj/table{icon_state = "tabledir"; dir = 10},/obj/item/weapon/book/manual/engineering_hacking{pixel_x = 3; pixel_y = 3},/obj/item/weapon/book/manual/engineering_construction,/obj/item/weapon/book/manual/engineering_guide{pixel_x = -3; pixel_y = -3},/turf/simulated/floor,/area/engine/chiefs_office) +"bUb" = (/obj/item/device/radio/intercom{broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20},/obj/cable{icon_state = "4-8"; d1 = 4; d2 = 8},/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/book/manual/engineering_singularity_safety{pixel_y = 6},/turf/simulated/floor,/area/engine/chiefs_office) "bUc" = (/obj/machinery/power/apc{dir = 1; name = "CE office APC"; pixel_x = 0; pixel_y = 25},/obj/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/engine/chiefs_office) "bUd" = (/obj/rack{dir = 8},/obj/item/clothing/suit/space/rig,/obj/item/clothing/head/helmet/space/rig,/obj/item/clothing/mask/medical,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/engine/chiefs_office) "bUe" = (/obj/secure_closet/engineering_chief,/turf/simulated/floor,/area/engine/chiefs_office) @@ -5223,7 +5223,7 @@ "bWw" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; icon_state = "off"; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/table{icon_state = "tabledir"; dir = 6},/obj/item/weapon/cartridge/engineering{pixel_x = 4; pixel_y = 5},/obj/item/weapon/cartridge/engineering{pixel_x = -3; pixel_y = 2},/obj/item/weapon/cartridge/engineering{pixel_x = 3},/turf/simulated/floor,/area/engine/chiefs_office) "bWx" = (/obj/table/reinforced{dir = 10; icon_state = "reinf_tabledir"; tag = "icon-reinf_tabledir"},/obj/item/weapon/medical/bruise_pack{pixel_x = -3; pixel_y = 2},/turf/simulated/floor,/area/engine/chiefs_office) "bWy" = (/obj/table/reinforced{tag = "icon-reinf_tabledir"; icon_state = "reinf_tabledir"},/obj/item/weapon/clipboard,/obj/item/weapon/stamp/ce,/obj/machinery/door_control{icon_state = "doorctrl0"; id = "Engineering"; name = "Engine Security Doors"; pixel_y = -25; req_access_txt = "11"},/turf/simulated/floor,/area/engine/chiefs_office) -"bWz" = (/obj/table/reinforced{tag = "icon-reinf_tabledir"; icon_state = "reinf_tabledir"},/obj/item/weapon/book/manual/engineering_singularity_safety{pixel_y = 6},/turf/simulated/floor,/area/engine/chiefs_office) +"bWz" = (/obj/table/reinforced{tag = "icon-reinf_tabledir"; icon_state = "reinf_tabledir"},/turf/simulated/floor,/area/engine/chiefs_office) "bWA" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (SOUTHEAST)"; icon_state = "reinf_tabledir"; dir = 6},/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/turf/simulated/floor,/area/engine/chiefs_office) "bWB" = (/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos) "bWC" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/turf/simulated/floor/engine{name = "n2 floor"; nitrogen = 100000; oxygen = 0},/area/atmos)