Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Advanced tools are medium sized, toolboxes can carry medium sized items. #66900

Merged
merged 5 commits into from May 13, 2022
Merged

Advanced tools are medium sized, toolboxes can carry medium sized items. #66900

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae3baa6
Advanced tools are medium sized now.
GuillaumePrata May 11, 2022
ae7a06e
Moves `w_class` 1 line down
GuillaumePrata May 11, 2022
a8d9430
Moves `w_class` MORE DOWN
GuillaumePrata May 11, 2022
6957c93
Syndie Jaw pocket edition.
GuillaumePrata May 11, 2022
9550422
Toolboxes can carry medium items, pocket syndie jaw in desc.
GuillaumePrata May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/game/objects/items/tools/crowbar.dm
View file
Open in desktop
Expand Up @@ -83,6 +83,7 @@
custom_materials = list(/datum/material/iron = 4500, /datum/material/silver = 2500, /datum/material/titanium = 3500)
usesound = 'sound/items/jaws_pry.ogg'
force = 15
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
force_opens = TRUE

Expand Down Expand Up @@ -113,6 +114,7 @@
name = "Syndicate jaws of life"
desc = "A re-engineered copy of Nanotrasen's standard jaws of life. Can be used to force open airlocks in its crowbar configuration."
GuillaumePrata marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "jaws_syndie"
w_class = WEIGHT_CLASS_SMALL
toolspeed = 0.5
force_opens = TRUE

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/tools/screwdriver.dm
View file
Open in desktop
Expand Up @@ -81,14 +81,14 @@
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
custom_materials = list(/datum/material/iron=3500, /datum/material/silver=1500, /datum/material/titanium=2500) //what research value?
force = 8 //might or might not be too high, subject to change
w_class = WEIGHT_CLASS_SMALL
throwforce = 8
throw_speed = 2
throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far
attack_verb_continuous = list("drills", "screws", "jabs", "whacks")
attack_verb_simple = list("drill", "screw", "jab", "whack")
hitsound = 'sound/items/drill_hit.ogg'
usesound = 'sound/items/drill_use.ogg'
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
random_color = FALSE
greyscale_config = null
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/tools/weldingtool.dm
View file
Open in desktop
Expand Up @@ -381,6 +381,7 @@
change_icons = FALSE
can_off_process = TRUE
light_range = 1
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.5
var/last_gen = 0
var/nextrefueltick = 0
Expand Down
3 changes: 3 additions & 0 deletions code/modules/surgery/tools.dm
View file
Open in desktop
Expand Up @@ -71,6 +71,7 @@
icon_state = "e_cautery"
custom_materials = list(/datum/material/iron = 4000, /datum/material/glass = 2000, /datum/material/plasma = 2000, /datum/material/uranium = 3000, /datum/material/titanium = 3000)
hitsound = 'sound/items/welder.ogg'
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
light_system = MOVABLE_LIGHT
light_range = 1
Expand Down Expand Up @@ -267,6 +268,7 @@
custom_materials = list(/datum/material/iron = 6000, /datum/material/glass = 1500, /datum/material/silver = 2000, /datum/material/gold = 1500, /datum/material/diamond = 200, /datum/material/titanium = 4000)
hitsound = 'sound/weapons/blade1.ogg'
force = 16
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7
light_system = MOVABLE_LIGHT
light_range = 1
Expand Down Expand Up @@ -314,6 +316,7 @@
icon = 'icons/obj/surgery.dmi'
custom_materials = list(/datum/material/iron = 12000, /datum/material/glass = 4000, /datum/material/silver = 4000, /datum/material/titanium = 5000)
icon_state = "adv_retractor"
w_class = WEIGHT_CLASS_NORMAL
toolspeed = 0.7

/obj/item/retractor/advanced/Initialize(mapload)
Expand Down