cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Condensed laser scalpels into a single version (#18697)

Browse Source 
* Condensed laser scalpels into a single version

title

* Remove unused laser scalpel icons
This commit is contained in:
Andrew
2024-03-23 17:24:41 +00:00
committed by GitHub
parent ebba155239
commit 50ba56174a
8 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/surgery_tools.dm
+6 -21
View File
@@ -105,34 +105,21 @@
/*
* Researchable Scalpels
*/
/obj/item/surgery/scalpel/laser1
name = "laser scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
icon_state = "scalpel_laser1"
surgerysound = 'sound/items/surgery/cautery.ogg'
damtype = "fire"
/obj/item/surgery/scalpel/laser2
/obj/item/surgery/scalpel/laser
name = "laser scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced."
icon_state = "scalpel_laser2"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field."
icon_state = "scalpel_laser"
surgerysound = 'sound/items/surgery/cautery.ogg'
matter = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500)
damtype = "fire"
force = 12
/obj/item/surgery/scalpel/laser3
name = "laser scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!"
icon_state = "scalpel_laser3"
surgerysound = 'sound/items/surgery/cautery.ogg'
damtype = "fire"
force = 15
/obj/item/surgery/scalpel/manager
name = "incision management system"
desc = "A true extension of the surgeon's body, this marvel instantly and completely prepares an incision allowing for the immediate commencement of therapeutic steps."
icon_state = "scalpel_manager"
surgerysound = 'sound/items/surgery/cautery.ogg'
matter = list (DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 1500, MATERIAL_GOLD = 1500, MATERIAL_DIAMOND = 750)
force = 7.5
/*
@@ -247,9 +234,7 @@
/obj/item/surgery/hemostat = "tray_hemostat",
/obj/item/surgery/retractor = "tray_retractor",
/obj/item/surgery/scalpel = "tray_scalpel",
/obj/item/surgery/scalpel/laser1 = "tray_scalpel_laser1",
/obj/item/surgery/scalpel/laser2 = "tray_scalpel_laser2",
/obj/item/surgery/scalpel/laser3 = "tray_scalpel_laser3",
/obj/item/surgery/scalpel/laser = "tray_scalpel_laser",
/obj/item/surgery/scalpel/manager = "tray_scalpel_manager",
/obj/item/surgery/surgicaldrill = "tray_drill",
/obj/item/surgery/bone_gel = "tray_bone-gel",
code/modules/cargo/random_stock/t2_uncommon.dm
+1 -7
View File
@@ -283,13 +283,7 @@ STOCK_ITEM_UNCOMMON(blade, 1.2)
new type(L)
STOCK_ITEM_UNCOMMON(laserscalpel, 1.3)
var/list/lasers = list(
/obj/item/surgery/scalpel/laser1 = 3,
/obj/item/surgery/scalpel/laser2 = 2,
/obj/item/surgery/scalpel/laser3 = 1
)
var/type = pickweight(lasers)
new type(L)
new /obj/item/surgery/scalpel/laser(L)
STOCK_ITEM_UNCOMMON(electropack, 1)
new /obj/item/device/radio/electropack(L)
code/modules/item_worth/worths_list.dm
+1 -3
View File
@@ -315,9 +315,7 @@ var/list/worths = list(
/obj/item/surgery/hemostat = 90,
/obj/item/surgery/cautery = 110,
/obj/item/surgery/surgicaldrill = 130,
/obj/item/surgery/scalpel/laser1 = 300,
/obj/item/surgery/scalpel/laser2 = 600,
/obj/item/surgery/scalpel/laser3 = 900,
/obj/item/surgery/scalpel/laser = 300,
/obj/item/surgery/scalpel/manager = 1200,
/obj/item/surgery/scalpel = 60,
/obj/item/surgery/circular_saw = 140,
code/modules/research/designs/protolathe/medical_designs.dm
+5 -19
View File
@@ -47,26 +47,12 @@
materials = list(DEFAULT_WALL_MATERIAL = 7000, MATERIAL_GLASS = 7000)
build_path = /obj/item/stack/nanopaste
/datum/design/item/medical/scalpel_laser1
name = "Basic Laser Scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks basic and could be improved."
req_tech = list(TECH_BIO = 2, TECH_MATERIAL = 2, TECH_MAGNET = 2)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500)
build_path = /obj/item/surgery/scalpel/laser1
/datum/design/item/medical/scalpel_laser2
name = "Improved Laser Scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks somewhat advanced."
/datum/design/item/medical/scalpel_laser
name = "Laser Scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field."
req_tech = list(TECH_BIO = 3, TECH_MATERIAL = 4, TECH_MAGNET = 4)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2500)
build_path = /obj/item/surgery/scalpel/laser2
/datum/design/item/medical/scalpel_laser3
name = "Advanced Laser Scalpel"
desc = "A scalpel augmented with a directed laser, for more precise cutting without blood entering the field. This one looks to be the pinnacle of precision energy cutlery!"
req_tech = list(TECH_BIO = 4, TECH_MATERIAL = 6, TECH_MAGNET = 5)
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500, MATERIAL_SILVER = 2000, MATERIAL_GOLD = 1500)
build_path = /obj/item/surgery/scalpel/laser3
materials = list(DEFAULT_WALL_MATERIAL = 12500, MATERIAL_GLASS = 7500)
build_path = /obj/item/surgery/scalpel/laser
/datum/design/item/medical/scalpel_manager
name = "Incision Management System"
code/modules/surgery/generic.dm
+1 -3
View File
@@ -25,9 +25,7 @@
/singleton/surgery_step/generic/cut_with_laser
name = "Make Laser Incision"
allowed_tools = list(
/obj/item/surgery/scalpel/laser3 = 95, \
/obj/item/surgery/scalpel/laser2 = 85, \
/obj/item/surgery/scalpel/laser1 = 75
/obj/item/surgery/scalpel/laser = 100
)
priority = 2
min_duration = 50
html/changelogs/Nalarac - LaserScalpel.yml
+41
View File
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: Nalarac
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Condensed the three laser scalpels into one that does not have a chance to fail."
icons/obj/surgery.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

maps/dungeon_spawns/vannatusk_unique.dmm
+1 -1
View File
@@ -14,7 +14,7 @@
/area/dungeon/bluespace_outpost)
"ae" = (
/obj/structure/table/standard,
/obj/item/surgery/scalpel/laser3,
/obj/item/surgery/scalpel/laser,
/obj/item/storage/box/freezer/organcooler,
/turf/simulated/floor/tiled/asteroid,
/area/dungeon/bluespace_outpost)