diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index 18f8a027c9a..4de56355822 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -220,3 +220,42 @@ /obj/item/storage/toolbox/surgery/empty/populate_contents() return +/obj/item/storage/toolbox/surgery/advanced + name = "Advanced Laser Surgery Kit" + desc = "Содержит в себе хирургические инструменты. Имеет зелёные неоновые накладки." + icon_state = "surgerykit_advanced" + item_state = "surgerykit_advanced" + +/obj/item/storage/toolbox/surgery/advanced/populate_contents() + new /obj/item/scalpel/laser/laser3(src) + new /obj/item/hemostat/laser(src) + new /obj/item/retractor/laser(src) + new /obj/item/surgicaldrill/laser(src) + new /obj/item/circular_saw/laser(src) + new /obj/item/bonesetter/laser(src) + new /obj/item/bonegel(src) + new /obj/item/FixOVein(src) + + +/obj/item/storage/toolbox/surgery/advanced/empty/populate_contents() + return + +/obj/item/storage/toolbox/surgery/alien + name = "Alien Surgery Kit" + desc = "Содержит в себе хирургические инструменты. Выглядит очень футуристично." + icon_state = "surgerykit_alien" + item_state = "surgerykit_alien" + +/obj/item/storage/toolbox/surgery/alien/populate_contents() + new /obj/item/scalpel/alien(src) + new /obj/item/hemostat/alien(src) + new /obj/item/retractor/alien(src) + new /obj/item/circular_saw/alien(src) + new /obj/item/surgicaldrill/alien(src) + new /obj/item/cautery/alien(src) + new /obj/item/bonegel/alien(src) + new /obj/item/bonesetter/alien(src) + new /obj/item/FixOVein/alien(src) + +/obj/item/storage/toolbox/surgery/alien/empty/populate_contents() + return diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 50848317145..19158649a7a 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -265,6 +265,17 @@ build_path = /obj/item/bonesetter/laser category = list("Medical") +/datum/design/item/laserfullkit + name = "Advanced Surgery Kit" + desc = "Полный набор современных хирургических инструментов." + id = "laser_fullsurgerykit" + req_tech = list("biotech" = 4, "materials" = 6, "magnets" = 5) + build_path = /obj/item/storage/toolbox/surgery/advanced + build_type = PROTOLATHE + materials = list(MAT_METAL = 13000, MAT_GLASS = 10000, MAT_SILVER = 6000, MAT_GOLD = 6000) + category = list("Medical") + + /datum/design/alienscalpel name = "Alien Scalpel" desc = "An advanced scalpel obtained through Abductor technology." @@ -355,6 +366,16 @@ materials = list(MAT_METAL = 2000, MAT_SILVER = 1500, MAT_PLASMA = 500, MAT_TITANIUM = 1500) category = list("Medical") +/datum/design/alienfullkit + name = "Alien Surgery Kit" + desc = "Полный набор инопланетных хирургических инструментов." + id = "alien_fullsurgerykit" + req_tech = list("biotech" = 4, "materials" = 4, "abductor" = 3) + build_path = /obj/item/storage/toolbox/surgery/alien + build_type = PROTOLATHE + materials = list(MAT_METAL = 34500, MAT_SILVER = 16000, MAT_PLASMA = 5500, MAT_TITANIUM = 13500) + category = list("Medical") + ///////////////////////////////////////// //////////Cybernetic Implants//////////// ///////////////////////////////////////// diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 3827cb89721..83b5c23b8f7 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -163,20 +163,20 @@ hitsound = 'sound/weapons/sear.ogg' /obj/item/scalpel/laser/laser1 //lasers also count as catuarys - name = "laser scalpel" - desc = "A scalpel augmented with a directed laser. This one looks basic and could be improved." + name = "Basic Laser Scalpel" + desc = "Скальпель, дополненный направленным лазером. Может быть усовершенствован." icon_state = "scalpel_laser1_on" toolspeed = 0.8 /obj/item/scalpel/laser/laser2 - name = "laser scalpel" - desc = "A scalpel augmented with a directed laser. This one looks somewhat advanced." + name = "Improved Laser Scalpel" + desc = "Скальпель, дополненный направленным лазером. Усовершенствованная версия лазерного скальпеля." icon_state = "scalpel_laser2_on" toolspeed = 0.6 /obj/item/scalpel/laser/laser3 - name = "laser scalpel" - desc = "A scalpel augmented with a directed laser. This one looks to be the pinnacle of precision energy cutlery!" + name = "Advanced Laser Scalpel" + desc = "Скальпель, дополненный направленным лазером. Высокоточная, модернизированная версия лазерного скальпеля." icon_state = "scalpel_laser3_on" toolspeed = 0.4 diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 79b2b01a901..bb2867191d2 100755 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 687862eca7f..9eb6f91f360 100755 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 3d4dea6aac0..f26aa801de5 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/paradise.dme b/paradise.dme index 7918fd0eeab..85c7ad843a5 100644 --- a/paradise.dme +++ b/paradise.dme @@ -51,7 +51,6 @@ #include "code\__DEFINES\combat.dm" #include "code\__DEFINES\configuration.dm" #include "code\__DEFINES\construction.dm" -#include "code\__DEFINES\spells.dm" #include "code\__DEFINES\contractors.dm" #include "code\__DEFINES\contracts.dm" #include "code\__DEFINES\cooldowns.dm" @@ -119,8 +118,8 @@ #include "code\__DEFINES\role_preferences.dm" #include "code\__DEFINES\rolebans.dm" #include "code\__DEFINES\rust_g.dm" -#include "code\__DEFINES\secret_documents.dm" #include "code\__DEFINES\rust_g_overrides.dm" +#include "code\__DEFINES\secret_documents.dm" #include "code\__DEFINES\sensor_devices.dm" #include "code\__DEFINES\shuttle.dm" #include "code\__DEFINES\sibyl.dm" @@ -130,6 +129,7 @@ #include "code\__DEFINES\span.dm" #include "code\__DEFINES\speech_channels.dm" #include "code\__DEFINES\speech_controller.dm" +#include "code\__DEFINES\spells.dm" #include "code\__DEFINES\stat.dm" #include "code\__DEFINES\stat_tracking.dm" #include "code\__DEFINES\station_goals.dm" @@ -432,8 +432,8 @@ #include "code\datums\cinematics\nuke_cinematics.dm" #include "code\datums\components\_component.dm" #include "code\datums\components\after_attacks_hub.dm" -#include "code\datums\components\aura_healing.dm" #include "code\datums\components\animal_temperature.dm" +#include "code\datums\components\aura_healing.dm" #include "code\datums\components\boomerang.dm" #include "code\datums\components\boss_music.dm" #include "code\datums\components\caltrop.dm"