cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated m_amt and g_amt to match their design

Browse Source
This commit is contained in:
Artorp
2015-02-17 18:52:31 +01:00
parent b89385144a
commit e1eb2b9a1d
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/camera/camera_assembly.dm
+2 -2
View File
@@ -5,8 +5,8 @@
icon_state = "cameracase"
w_class = 2
anchored = 0
m_amt = 700
g_amt = 300
m_amt = 400
g_amt = 250
// Motion, EMP-Proof, X-Ray
var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/osmium, /obj/item/weapon/stock_parts/scanning_module)
code/game/objects/items/weapons/surgery_tools.dm
+10 -10
View File
@@ -16,8 +16,8 @@
desc = "Retracts stuff."
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
m_amt = 10000
g_amt = 5000
m_amt = 6000
g_amt = 3000
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -265,8 +265,8 @@ LOOK FOR SURGERY.DM*/
desc = "This stops bleeding."
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
m_amt = 5000
g_amt = 2500
m_amt = 2500
g_amt = 750
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -356,8 +356,8 @@ LOOK FOR SURGERY.DM*/
icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
hitsound = 'sound/weapons/circsawhit.ogg'
m_amt = 15000
g_amt = 10000
m_amt = 10000
g_amt = 6000
flags = FPRINT | TABLEPASS | CONDUCT
force = 15.0
w_class = 2.0
@@ -385,8 +385,8 @@ LOOK FOR SURGERY.DM*/
throwforce = 5.0
throw_speed = 3
throw_range = 5
m_amt = 10000
g_amt = 5000
m_amt = 4000
g_amt = 1000
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -637,8 +637,8 @@ LOOK FOR SURGERY.DM*/
throwforce = 9.0
throw_speed = 3
throw_range = 5
m_amt = 20000
g_amt = 10000
m_amt = 10000
g_amt = 6000
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
sharp = 1
code/game/objects/items/weapons/tools.dm
+1 -1
View File
@@ -147,7 +147,7 @@
//Cost to make in the autolathe
m_amt = 70
g_amt = 30
g_amt = 20
//R&D tech level
origin_tech = "engineering=1"
code/modules/assembly/signaler.dm
+2 -2
View File
@@ -3,8 +3,8 @@
desc = "Used to remotely activate devices."
icon_state = "signaller"
item_state = "signaler"
m_amt = 1000
g_amt = 200
m_amt = 400
g_amt = 120
origin_tech = "magnets=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -226,7 +226,7 @@
user << "\red [target] is full."
return
if(istype(target, /obj/item/weapon/reagent_containers))
code/modules/research/designs/autolathe_designs.dm
+3 -3
View File
@@ -230,7 +230,7 @@
name = "Metal"
id = "metal"
build_type = AUTOLATHE
materials = list("$metal" = MINERAL_MATERIAL_AMOUNT)
materials = list("$metal" = 3750)
build_path = /obj/item/stack/sheet/metal
category = list("initial","Construction")
@@ -254,7 +254,7 @@
name = "Reinforced Glass"
id = "rglass"
build_type = AUTOLATHE
materials = list("$metal" = 1000, "$glass" = MINERAL_MATERIAL_AMOUNT)
materials = list("$metal" = 1875, "$glass" = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/rglass
category = list("initial","Construction")
@@ -262,7 +262,7 @@
name = "Metal Rod"
id = "rods"
build_type = AUTOLATHE
materials = list("$metal" = 1000)
materials = list("$metal" = 1875)
build_path = /obj/item/stack/rods
category = list("initial","Construction")