Skip to content

Commit

Permalink
add: advanced laser & alien surgery kits (#6057)
Browse files Browse the repository at this point in the history
  • Loading branch information
NightDawnFox authored Nov 5, 2024
1 parent cca0ce5 commit fd49d4e
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 9 deletions.
39 changes: 39 additions & 0 deletions code/game/objects/items/weapons/storage/toolbox.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
21 changes: 21 additions & 0 deletions code/modules/research/designs/medical_designs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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////////////
/////////////////////////////////////////
Expand Down
12 changes: 6 additions & 6 deletions code/modules/surgery/tools.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified icons/mob/inhands/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/items_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.
6 changes: 3 additions & 3 deletions paradise.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit fd49d4e

Please sign in to comment.