cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Demotes the "electrical conductivity" flag from flags_1 to obj_flags (#80033)

Browse Source 
## About The Pull Request

Code to handle this flag only ever existed on the `/obj` sublevel, so
there's no need for it to be on the `/atom` level `flags_1`. There was
probably a point in time in which mobs or turfs conducted electricity
but there's zero code for it anymore so we truly just live in a society
now.
## Why It's Good For The Game

Frees up a slot on `flags_1` (which is really nice actually), proper
scoping of certain bitflag stuff, etc.
## Changelog
Not relevant to players.

I may have screwed something up, will be doing a few passes on this
myself to ensure all the search and replaces went alright but we should
be good™️
This commit is contained in:
san7890
2023-12-01 21:43:46 -05:00
committed by GitHub
parent 466c8fb3c0
commit 7f7688b60a
109 changed files with 190 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/tools.dm
+8 -8
View File
@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3, /datum/material/glass =SHEET_MATERIAL_AMOUNT * 1.5)
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
w_class = WEIGHT_CLASS_TINY
tool_behaviour = TOOL_RETRACTOR
@@ -32,7 +32,7 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.25)
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
w_class = WEIGHT_CLASS_TINY
attack_verb_continuous = list("attacks", "pinches")
@@ -59,7 +59,7 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/glass = SMALL_MATERIAL_AMOUNT*7.5)
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
w_class = WEIGHT_CLASS_TINY
attack_verb_continuous = list("burns")
@@ -139,7 +139,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*3)
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
force = 15
demolition_mod = 0.5
@@ -182,7 +182,7 @@
inhand_icon_state = "scalpel"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
force = 10
demolition_mod = 0.25
@@ -232,7 +232,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
mob_throw_hit_sound = 'sound/weapons/pierce.ogg'
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
force = 15
w_class = WEIGHT_CLASS_NORMAL
@@ -473,7 +473,7 @@
desc = "A type of heavy duty surgical shears used for achieving a clean separation between limb and patient. Keeping the patient still is imperative to be able to secure and align the shears."
icon = 'icons/obj/medical/surgery_tools.dmi'
icon_state = "shears"
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
toolspeed = 1
force = 12
@@ -559,7 +559,7 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
custom_materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25)
flags_1 = CONDUCT_1
obj_flags = CONDUCTS_ELECTRICITY
item_flags = SURGICAL_TOOL
w_class = WEIGHT_CLASS_SMALL
attack_verb_continuous = list("corrects", "properly sets")