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

Materials subsystem, material defines instead of strings, structure materials. (#8447)

Browse Source 
The shitcode crusade begins.
This commit is contained in:
Matt Atlas
2020-03-18 20:19:11 +01:00
committed by GitHub
parent d952493ca0
commit 82437acd43
127 changed files with 687 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/debugger.dm
+1 -1
View File
@@ -11,6 +11,6 @@
throw_range = 15
throw_speed = 3
matter = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
code/game/objects/items/devices/lighting/flashlight.dm
+3 -3
View File
@@ -11,7 +11,7 @@
uv_intensity = 50
light_wedge = LIGHT_WIDE
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
action_button_name = "Toggle Flashlight"
var/on = 0
@@ -126,7 +126,7 @@
brightness_on = 4
w_class = 3
uv_intensity = 60
matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 70)
matter = list(DEFAULT_WALL_MATERIAL = 100, MATERIAL_GLASS = 70)
light_wedge = LIGHT_SEMI
/obj/item/device/flashlight/maglight
@@ -139,7 +139,7 @@
w_class = 3
uv_intensity = 70
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
matter = list(DEFAULT_WALL_MATERIAL = 200,"glass" = 100)
matter = list(DEFAULT_WALL_MATERIAL = 200, MATERIAL_GLASS = 100)
hitsound = 'sound/weapons/smash.ogg'
light_wedge = LIGHT_NARROW
code/game/objects/items/devices/lightmeter.dm
+1 -1
View File
@@ -13,7 +13,7 @@
throwforce = 5.0
throw_range = 15
throw_speed = 3
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
var/low = 0
var/high = 1
code/game/objects/items/devices/multitool.dm
+1 -1
View File
@@ -16,7 +16,7 @@
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
code/game/objects/items/devices/powersink.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_speed = 1
throw_range = 2
matter = list(DEFAULT_WALL_MATERIAL = 750,"waste" = 750)
matter = list(DEFAULT_WALL_MATERIAL = 750)
origin_tech = list(TECH_POWER = 3, TECH_ILLEGAL = 5)
var/drain_rate = 1500000 // amount of power to drain per tick
code/game/objects/items/devices/radio/electropack.dm
+1 -1
View File
@@ -8,7 +8,7 @@
slot_flags = SLOT_BACK
w_class = 5.0
matter = list(DEFAULT_WALL_MATERIAL = 10000,"glass" = 2500)
matter = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 2500)
var/code = 2
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -44,7 +44,7 @@ var/global/list/default_medbay_channels = list(
throw_speed = 2
throw_range = 9
w_class = 2
matter = list("glass" = 25,DEFAULT_WALL_MATERIAL = 75)
matter = list(DEFAULT_WALL_MATERIAL = 75, MATERIAL_GLASS = 25)
var/const/FREQ_LISTENING = 1
var/list/internal_channels
code/game/objects/items/devices/scanners.dm
+6 -6
View File
@@ -331,7 +331,7 @@ BREATH ANALYZER
throw_speed = 4
throw_range = 20
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1)
@@ -365,7 +365,7 @@ BREATH ANALYZER
throw_speed = 4
throw_range = 20
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
var/details = 0
@@ -426,7 +426,7 @@ BREATH ANALYZER
throwforce = 5
throw_speed = 4
throw_range = 20
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
var/details = 0
@@ -474,7 +474,7 @@ BREATH ANALYZER
throwforce = 0
throw_speed = 3
throw_range = 7
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
/obj/item/device/slime_scanner/attack(mob/living/M, mob/living/user)
if(!isslime(M))
@@ -516,7 +516,7 @@ BREATH ANALYZER
throwforce = 0
throw_speed = 3
throw_range = 3
matter = list(DEFAULT_WALL_MATERIAL = 25, "glass" = 25)
matter = list(DEFAULT_WALL_MATERIAL = 25, MATERIAL_GLASS = 25)
/obj/item/device/price_scanner/afterattack(atom/movable/target, mob/user as mob, proximity)
if(!proximity)
@@ -537,7 +537,7 @@ BREATH ANALYZER
throwforce = 0
throw_speed = 3
throw_range = 3
matter = list(DEFAULT_WALL_MATERIAL = 30,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 30, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 2, TECH_BIO = 2)
/obj/item/device/breath_analyzer/attack(mob/living/carbon/human/H, mob/living/user as mob)
code/game/objects/items/devices/suit_cooling.dm
+1 -1
View File
@@ -19,7 +19,7 @@
var/celltype = /obj/item/cell/high
matter = list(DEFAULT_WALL_MATERIAL = 25000, "glass" = 3500)
matter = list(DEFAULT_WALL_MATERIAL = 25000, MATERIAL_GLASS = 3500)
var/on = 0 //is it turned on?
var/cover_open = 0 //is the cover open?
var/obj/item/cell/cell
code/game/objects/items/devices/tagger.dm
+1 -1
View File
@@ -11,7 +11,7 @@
throw_speed = 3
var/animaltag = null
matter = list(DEFAULT_WALL_MATERIAL = 50,"glass" = 20)
matter = list(DEFAULT_WALL_MATERIAL = 50, MATERIAL_GLASS = 20)
origin_tech = list(TECH_MAGNET = 2, TECH_ENGINEERING = 1)
code/game/objects/items/devices/taperecorder.dm
+1 -1
View File
@@ -5,7 +5,7 @@
item_state = "analyzer"
w_class = 2.0
matter = list(DEFAULT_WALL_MATERIAL = 60,"glass" = 30)
matter = list(DEFAULT_WALL_MATERIAL = 60, MATERIAL_GLASS = 30)
var/emagged = 0.0
var/recording = 0.0