cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-21 02:56:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5219 from Zuhayr/autolathe

Browse Source 
Autolathe rewrite.
This commit is contained in:
Chinsky
2014-06-12 20:28:44 +04:00
parent 0722775bda 4244479e43
commit 6d432d8e9d
81 changed files with 950 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/debugger.dm
+3 -2
View File
@@ -16,8 +16,9 @@
throw_range = 15
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
m_amt = 50
g_amt = 20
matter = list("metal" = 50,"glass" = 20)
origin_tech = "magnets=1;engineering=1"
var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
code/game/objects/items/devices/flashlight.dm
+7 -9
View File
@@ -7,8 +7,9 @@
w_class = 2
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
m_amt = 50
g_amt = 20
matter = list("metal" = 50,"glass" = 20)
icon_action_button = "action_flashlight"
var/on = 0
var/brightness_on = 4 //luminosity when on
@@ -128,8 +129,7 @@
brightness_on = 5
w_class = 4
flags = FPRINT | TABLEPASS | CONDUCT
m_amt = 0
g_amt = 0
on = 1
@@ -204,7 +204,7 @@
src.force = on_damage
src.damtype = "fire"
processing_objects += src
/obj/item/device/flashlight/slime
gender = PLURAL
name = "glowing slime extract"
@@ -213,16 +213,14 @@
icon_state = "floor1" //not a slime extract sprite but... something close enough!
item_state = "slime"
w_class = 1
m_amt = 0
g_amt = 0
brightness_on = 6
on = 1 //Bio-luminesence has one setting, on.
/obj/item/device/flashlight/slime/New()
SetLuminosity(brightness_on)
spawn(1) //Might be sloppy, but seems to be necessary to prevent further runtimes and make these work as intended... don't judge me!
update_brightness()
icon_state = initial(icon_state)
/obj/item/device/flashlight/slime/attack_self(mob/user)
return //Bio-luminescence does not toggle.
code/game/objects/items/devices/multitool.dm
+3 -2
View File
@@ -15,7 +15,8 @@
throw_range = 15
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
m_amt = 50
g_amt = 20
matter = list("metal" = 50,"glass" = 20)
origin_tech = "magnets=1;engineering=1"
var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
code/game/objects/items/devices/powersink.dm
+3 -2
View File
@@ -10,8 +10,9 @@
throwforce = 5
throw_speed = 1
throw_range = 2
m_amt = 750
w_amt = 750
matter = list("metal" = 750,"waste" = 750)
origin_tech = "powerstorage=3;syndicate=5"
var/drain_rate = 600000 // amount of power to drain per tick
var/power_drained = 0 // has drained this much power
code/game/objects/items/devices/radio/electropack.dm
+3 -2
View File
@@ -7,8 +7,9 @@
flags = FPRINT | CONDUCT | TABLEPASS
slot_flags = SLOT_BACK
w_class = 5.0
g_amt = 2500
m_amt = 10000
matter = list("metal" = 10000,"glass" = 2500)
var/code = 2
/obj/item/device/radio/electropack/attack_hand(mob/user as mob)
code/game/objects/items/devices/radio/headset.dm
+1 -2
View File
@@ -3,8 +3,7 @@
desc = "An updated, modular intercom that fits over the head. Takes encryption keys"
icon_state = "headset"
item_state = "headset"
g_amt = 0
m_amt = 75
matter = list("metal" = 75)
subspace_transmission = 1
canhear_range = 0 // can't hear headsets from very far away
code/game/objects/items/devices/radio/radio.dm
+5 -4
View File
@@ -30,8 +30,9 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
throw_speed = 2
throw_range = 9
w_class = 2
g_amt = 25
m_amt = 75
matter = list("glass" = 25,"metal" = 75)
var/const/WIRE_SIGNAL = 1 //sends a signal, like to set off a bomb or electrocute someone
var/const/WIRE_RECEIVE = 2
var/const/WIRE_TRANSMIT = 4
@@ -761,10 +762,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
continue
src.channels += ch_name
src.channels[ch_name] += keyslot.channels[ch_name]
if(keyslot.syndie)
src.syndie = 1
for (var/ch_name in src.channels)
if(!radio_controller)
code/game/objects/items/devices/scanners.dm
+12 -8
View File
@@ -17,7 +17,9 @@ REAGENT SCANNER
slot_flags = SLOT_BELT
w_class = 2
item_state = "electronic"
m_amt = 150
matter = list("metal" = 150)
origin_tech = "magnets=1;engineering=1"
/obj/item/device/t_scanner/attack_self(mob/user)
@@ -71,7 +73,7 @@ REAGENT SCANNER
w_class = 2.0
throw_speed = 5
throw_range = 10
m_amt = 200
matter = list("metal" = 200)
origin_tech = "magnets=1;biotech=1"
var/mode = 1;
@@ -209,8 +211,9 @@ REAGENT SCANNER
throwforce = 5
throw_speed = 4
throw_range = 20
m_amt = 30
g_amt = 20
matter = list("metal" = 30,"glass" = 20)
origin_tech = "magnets=1;engineering=1"
/obj/item/device/analyzer/attack_self(mob/user as mob)
@@ -279,8 +282,9 @@ REAGENT SCANNER
throwforce = 5
throw_speed = 4
throw_range = 20
m_amt = 30
g_amt = 20
matter = list("metal" = 30,"glass" = 20)
origin_tech = "magnets=2;biotech=2"
var/details = 0
var/recent_fail = 0
@@ -352,8 +356,8 @@ REAGENT SCANNER
throwforce = 5
throw_speed = 4
throw_range = 20
m_amt = 30
g_amt = 20
matter = list("metal" = 30,"glass" = 20)
origin_tech = "magnets=2;biotech=2"
var/details = 0
var/recent_fail = 0
code/game/objects/items/devices/taperecorder.dm
+3 -2
View File
@@ -4,8 +4,9 @@
icon_state = "taperecorderidle"
item_state = "analyzer"
w_class = 2.0
m_amt = 60
g_amt = 30
matter = list("metal" = 60,"glass" = 30)
var/emagged = 0.0
var/recording = 0.0
var/playing = 0.0
code/game/objects/items/stacks/rods.dm
+2 -2
View File
@@ -9,7 +9,7 @@
throwforce = 15.0
throw_speed = 5
throw_range = 20
m_amt = 1875
matter = list("metal" = 1875)
max_amount = 60
attack_verb = list("hit", "bludgeoned", "whacked")
@@ -63,4 +63,4 @@
usr << "\blue You assemble a grille"
F.add_fingerprint(usr)
use(2)
return
return
code/game/objects/items/stacks/sheets/glass.dm
+8 -9
View File
@@ -15,7 +15,7 @@
desc = "HOLY SHEET! That is a lot of glass."
singular_name = "glass sheet"
icon_state = "sheet-glass"
g_amt = 3750
matter = list("glass" = 3750)
origin_tech = "materials=1"
var/created_window = /obj/structure/window/basic
@@ -24,7 +24,7 @@
desc = "HOLY SHEET! That is a lot of glass."
singular_name = "glass sheet"
icon_state = "sheet-glass"
g_amt = 0
matter = null
created_window = /obj/structure/window/basic
/obj/item/stack/sheet/glass/attack_self(mob/user as mob)
@@ -123,8 +123,9 @@
desc = "Glass which seems to have rods or something stuck in them."
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
g_amt = 3750
m_amt = 1875
matter = list("metal" = 1875,"glass" = 3750)
origin_tech = "materials=2"
/obj/item/stack/sheet/rglass/cyborg
@@ -132,8 +133,6 @@
desc = "Glass which seems to have rods or something stuck in them."
singular_name = "reinforced glass sheet"
icon_state = "sheet-rglass"
g_amt = 0
m_amt = 0
/obj/item/stack/sheet/rglass/attack_self(mob/user as mob)
construct_window(user)
@@ -317,7 +316,7 @@
desc = "A very strong and very resistant sheet of a phoron-glass alloy."
singular_name = "phoron glass sheet"
icon_state = "sheet-phoronglass"
g_amt = 7500
matter = list("glass" = 7500)
origin_tech = "materials=3;phoron=2"
created_window = /obj/structure/window/phoronbasic
@@ -349,8 +348,8 @@
desc = "Phoron glass which seems to have rods or something stuck in them."
singular_name = "reinforced phoron glass sheet"
icon_state = "sheet-phoronrglass"
g_amt = 7500
m_amt = 1875
matter = list("glass" = 7500,"metal" = 1875)
origin_tech = "materials=4;phoron=2"
created_window = /obj/structure/window/phoronreinforced
code/game/objects/items/stacks/sheets/sheet_types.dm
+2 -3
View File
@@ -77,7 +77,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
desc = "Sheets made out off metal. It has been dubbed Metal Sheets."
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 3750
matter = list("metal" = 3750)
throwforce = 14.0
flags = FPRINT | TABLEPASS | CONDUCT
origin_tech = "materials=1"
@@ -87,7 +87,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
desc = "Sheets made out off metal. It has been dubbed Metal Sheets."
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 0
throwforce = 14.0
flags = FPRINT | TABLEPASS | CONDUCT
@@ -112,7 +111,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
desc = "This sheet is an alloy of iron and phoron."
icon_state = "sheet-plasteel"
item_state = "sheet-metal"
m_amt = 7500
matter = list("metal" = 7500)
throwforce = 15.0
flags = FPRINT | TABLEPASS | CONDUCT
origin_tech = "materials=2"
code/game/objects/items/stacks/tiles/plasteel.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "tile"
w_class = 3.0
force = 6.0
m_amt = 937.5
matter = list("metal" = 937.5)
throwforce = 15.0
throw_speed = 5
throw_range = 20
@@ -42,4 +42,4 @@
S.ChangeTurf(/turf/simulated/floor/plating)
// var/turf/simulated/floor/W = S.ReplaceWithFloor()
// W.make_plating()
return
return
code/game/objects/items/toys.dm
+6 -4
View File
@@ -126,8 +126,9 @@
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
w_class = 3.0
g_amt = 10
m_amt = 10
matter = list("glass" = 10,"metal" = 10)
attack_verb = list("struck", "pistol whipped", "hit", "bashed")
var/bullets = 7.0
@@ -182,8 +183,9 @@
icon_state = "357-7"
flags = FPRINT | TABLEPASS| CONDUCT
w_class = 1.0
g_amt = 10
m_amt = 10
matter = list("metal" = 10,"glass" = 10)
var/amount_left = 7.0
update_icon()
code/game/objects/items/weapons/RCD.dm
+12 -13
View File
@@ -18,10 +18,10 @@ RCD
throw_speed = 1
throw_range = 5
w_class = 3.0
m_amt = 50000
matter = list("metal" = 50000)
origin_tech = "engineering=4;materials=2"
var/datum/effect/effect/system/spark_spread/spark_system
var/matter = 0
var/stored_matter = 0
var/working = 0
var/mode = 1
var/canRwall = 0
@@ -29,7 +29,7 @@ RCD
New()
desc = "A RCD. It currently holds [matter]/30 matter-units."
desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -39,15 +39,15 @@ RCD
attackby(obj/item/weapon/W, mob/user)
..()
if(istype(W, /obj/item/weapon/rcd_ammo))
if((matter + 10) > 30)
if((stored_matter + 10) > 30)
user << "<span class='notice'>The RCD cant hold any more matter-units.</span>"
return
user.drop_item()
del(W)
matter += 10
stored_matter += 10
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
user << "<span class='notice'>The RCD now holds [matter]/30 matter-units.</span>"
desc = "A RCD. It currently holds [matter]/30 matter-units."
user << "<span class='notice'>The RCD now holds [stored_matter]/30 matter-units.</span>"
desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
return
@@ -163,14 +163,14 @@ RCD
return 0
/obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user)
if(matter < amount)
if(stored_matter < amount)
return 0
matter -= amount
desc = "A RCD. It currently holds [matter]/30 matter-units."
stored_matter -= amount
desc = "A RCD. It currently holds [stored_matter]/30 matter-units."
return 1
/obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)
return matter >= amount
return stored_matter >= amount
/obj/item/weapon/rcd/borg/useResource(var/amount, var/mob/user)
if(!isrobot(user))
return 0
@@ -196,5 +196,4 @@ RCD
density = 0
anchored = 0.0
origin_tech = "materials=2"
m_amt = 30000
g_amt = 15000
matter = list("metal" = 30000,"glass" = 15000)
code/game/objects/items/weapons/RSF.dm
+56 -54
View File
@@ -3,6 +3,8 @@ CONTAINS:
RSF
*/
//TODO: WHAT THE FUCK, FIX THIS GARBAGE.
/obj/item/weapon/rsf
name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
@@ -11,26 +13,26 @@ RSF
opacity = 0
density = 0
anchored = 0.0
var/matter = 0
var/stored_matter = 0
var/mode = 1
flags = TABLEPASS
w_class = 3.0
/obj/item/weapon/rsf/New()
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob)
..()
if (istype(W, /obj/item/weapon/rcd_ammo))
if ((matter + 10) > 30)
if ((stored_matter + 10) > 30)
user << "The RSF cant hold any more matter."
return
del(W)
matter += 10
stored_matter += 10
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
/obj/item/weapon/rsf/attack_self(mob/user as mob)
@@ -67,7 +69,7 @@ RSF
return
if (istype(A, /obj/structure/table) && mode == 1)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Dosh..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A.loc )
@@ -75,13 +77,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 1)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Dosh..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/spacecash/c10( A )
@@ -89,13 +91,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh!
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /obj/structure/table) && mode == 2)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Drinking Glass..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc )
@@ -103,13 +105,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 50
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 2)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Drinking Glass..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A )
@@ -117,13 +119,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 50
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /obj/structure/table) && mode == 3)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Paper Sheet..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/paper( A.loc )
@@ -131,13 +133,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 10
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 3)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Paper Sheet..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/paper( A )
@@ -145,13 +147,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 10
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /obj/structure/table) && mode == 4)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Pen..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/pen( A.loc )
@@ -159,13 +161,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 50
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 4)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Pen..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/pen( A )
@@ -173,13 +175,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 50
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /obj/structure/table) && mode == 5)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Dice Pack..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/storage/pill_bottle/dice( A.loc )
@@ -187,13 +189,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 5)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Dice Pack..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/weapon/storage/pill_bottle/dice( A )
@@ -201,13 +203,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 200
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /obj/structure/table) && mode == 6)
if (istype(A, /obj/structure/table) && matter >= 1)
if (istype(A, /obj/structure/table) && stored_matter >= 1)
user << "Dispensing Cigarette..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/clothing/mask/cigarette( A.loc )
@@ -215,13 +217,13 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 10
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
else if (istype(A, /turf/simulated/floor) && mode == 6)
if (istype(A, /turf/simulated/floor) && matter >= 1)
if (istype(A, /turf/simulated/floor) && stored_matter >= 1)
user << "Dispensing Cigarette..."
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
new /obj/item/clothing/mask/cigarette( A )
@@ -229,7 +231,7 @@ RSF
var/mob/living/silicon/robot/engy = user
engy.cell.charge -= 10
else
matter--
user << "The RSF now holds [matter]/30 fabrication-units."
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
stored_matter--
user << "The RSF now holds [stored_matter]/30 fabrication-units."
desc = "A RSF. It currently holds [stored_matter]/30 fabrication-units."
return
code/game/objects/items/weapons/extinguisher.dm
+1 -2
View File
@@ -11,7 +11,7 @@
throw_speed = 2
throw_range = 10
force = 10.0
m_amt = 90
matter = list("metal" = 90)
attack_verb = list("slammed", "whacked", "bashed", "thunked", "battered", "bludgeoned", "thrashed")
var/max_water = 50
var/last_use = 1.0
@@ -28,7 +28,6 @@
throwforce = 2
w_class = 2.0
force = 3.0
m_amt = 0
max_water = 30
sprite_name = "miniFE"
code/game/objects/items/weapons/flamethrower.dm
+1 -1
View File
@@ -10,7 +10,7 @@
throw_speed = 1
throw_range = 5
w_class = 3.0
m_amt = 500
matter = list("metal" = 500)
origin_tech = "combat=1;phorontech=1"
var/status = 0
var/throw_amount = 100
code/game/objects/items/weapons/handcuffs.dm
+1 -1
View File
@@ -10,7 +10,7 @@
w_class = 2.0
throw_speed = 2
throw_range = 5
m_amt = 500
matter = list("metal" = 500)
origin_tech = "materials=1"
var/dispenser = 0
var/breakouttime = 1200 //Deciseconds = 120s = 2 minutes
code/game/objects/items/weapons/kitchen.dm
+3 -3
View File
@@ -159,7 +159,7 @@
throwforce = 6.0
throw_speed = 3
throw_range = 6
m_amt = 12000
matter = list("metal" = 12000)
origin_tech = "materials=1"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -189,7 +189,7 @@
throwforce = 8.0
throw_speed = 3
throw_range = 6
m_amt = 12000
matter = list("metal" = 12000)
origin_tech = "materials=1"
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -259,7 +259,7 @@
throw_range = 5
w_class = 3.0
flags = FPRINT | TABLEPASS | CONDUCT
m_amt = 3000
matter = list("metal" = 3000)
/* // NOPE
var/food_total= 0
var/burger_amt = 0
code/game/objects/items/weapons/paint.dm
+1 -2
View File
@@ -8,8 +8,7 @@ var/global/list/cached_icons = list()
icon = 'icons/obj/items.dmi'
icon_state = "paint_neutral"
item_state = "paintcan"
m_amt = 200
g_amt = 0
matter = list("metal" = 200)
w_class = 3.0
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,50,70)
code/game/objects/items/weapons/power_cells.dm
+8 -12
View File
@@ -13,12 +13,11 @@
w_class = 3.0
var/charge = 0 // note %age conveted to actual charge in New
var/maxcharge = 1000
m_amt = 700
g_amt = 50
var/rigged = 0 // true if rigged to explode
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
var/construction_cost = list("metal"=750,"glass"=75)
var/construction_time=100
matter = list("metal" = 700, "glass" = 50)
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</b>"
@@ -29,7 +28,7 @@
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
origin_tech = "powerstorage=0"
maxcharge = 500
g_amt = 40
matter = list("glass" = 40)
/obj/item/weapon/cell/crap/empty/New()
..()
@@ -39,7 +38,7 @@
name = "security borg rechargable D battery"
origin_tech = "powerstorage=0"
maxcharge = 600 //600 max charge / 100 charge per shot = six shots
g_amt = 40
matter = list("glass" = 40)
/obj/item/weapon/cell/secborg/empty/New()
..()
@@ -50,7 +49,7 @@
origin_tech = "powerstorage=2"
icon_state = "hcell"
maxcharge = 10000
g_amt = 60
matter = list("glass" = 60)
/obj/item/weapon/cell/high/empty/New()
..()
@@ -61,7 +60,7 @@
origin_tech = "powerstorage=5"
icon_state = "scell"
maxcharge = 20000
g_amt = 70
matter = list("glass" = 70)
construction_cost = list("metal"=750,"glass"=100)
/obj/item/weapon/cell/super/empty/New()
@@ -73,7 +72,7 @@
origin_tech = "powerstorage=6"
icon_state = "hpcell"
maxcharge = 30000
g_amt = 80
matter = list("glass" = 80)
construction_cost = list("metal"=500,"glass"=150,"gold"=200,"silver"=200)
/obj/item/weapon/cell/hyper/empty/New()
@@ -85,7 +84,7 @@
icon_state = "icell"
origin_tech = null
maxcharge = 30000
g_amt = 80
matter = list("glass"= 80)
use()
return 1
@@ -97,8 +96,6 @@
icon_state = "potato_cell" //"potato_battery"
charge = 100
maxcharge = 300
m_amt = 0
g_amt = 0
minor_fault = 1
@@ -110,5 +107,4 @@
icon_state = "yellow slime extract" //"potato_battery"
maxcharge = 10000
maxcharge = 10000
m_amt = 0
g_amt = 0
matter = null
code/game/objects/items/weapons/shields.dm
+1 -2
View File
@@ -13,8 +13,7 @@
throw_speed = 1
throw_range = 4
w_class = 4.0
g_amt = 7500
m_amt = 1000
matter = list("glass" = 7500, "metal" = 1000)
origin_tech = "materials=2"
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
code/game/objects/items/weapons/surgery_tools.dm
+6 -12
View File
@@ -16,8 +16,7 @@
desc = "Retracts stuff."
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
m_amt = 10000
g_amt = 5000
matter = list("metal" = 10000, "glass" = 5000)
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -130,8 +129,7 @@ LOOK FOR SURGERY.DM*/
desc = "You think you have seen this before."
icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
m_amt = 5000
g_amt = 2500
matter = list("metal" = 5000, "glass" = 2500)
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -265,8 +263,7 @@ LOOK FOR SURGERY.DM*/
desc = "This stops bleeding."
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
m_amt = 5000
g_amt = 2500
matter = list("metal" = 5000, "glass" = 2500)
flags = FPRINT | TABLEPASS | CONDUCT
w_class = 2.0
origin_tech = "materials=1;biotech=1"
@@ -356,8 +353,7 @@ LOOK FOR SURGERY.DM*/
icon = 'icons/obj/surgery.dmi'
icon_state = "drill"
hitsound = 'sound/weapons/circsawhit.ogg'
m_amt = 15000
g_amt = 10000
matter = list("metal" = 15000, "glass" = 10000)
flags = FPRINT | TABLEPASS | CONDUCT
force = 15.0
w_class = 2.0
@@ -383,8 +379,7 @@ LOOK FOR SURGERY.DM*/
throwforce = 5.0
throw_speed = 3
throw_range = 5
m_amt = 10000
g_amt = 5000
matter = list("metal" = 10000, "glass" = 5000)
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -664,8 +659,7 @@ LOOK FOR SURGERY.DM*/
throwforce = 9.0
throw_speed = 3
throw_range = 5
m_amt = 20000
g_amt = 10000
matter = list("metal" = 20000,"glass" = 10000)
origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "slashed", "sawed", "cut")
code/game/objects/items/weapons/teleportation.dm
+2 -2
View File
@@ -21,7 +21,7 @@
item_state = "electronic"
throw_speed = 4
throw_range = 20
m_amt = 400
matter = list("metal" = 400)
origin_tech = "magnets=1"
/obj/item/weapon/locator/attack_self(mob/user as mob)
@@ -132,7 +132,7 @@ Frequency:
w_class = 2.0
throw_speed = 3
throw_range = 5
m_amt = 10000
matter = list("metal" = 10000)
origin_tech = "magnets=1;bluespace=3"
/obj/item/weapon/hand_tele/attack_self(mob/user as mob)
code/game/objects/items/weapons/tools.dm
+8 -13
View File
@@ -24,7 +24,7 @@
force = 5.0
throwforce = 7.0
w_class = 2.0
m_amt = 150
matter = list("metal" = 150)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -44,8 +44,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 5
g_amt = 0
m_amt = 75
matter = list("metal" = 75)
attack_verb = list("stabbed")
suicide_act(mob/user)
@@ -103,7 +102,7 @@
throw_speed = 2
throw_range = 9
w_class = 2.0
m_amt = 80
matter = list("metal" = 80)
origin_tech = "materials=1;engineering=1"
attack_verb = list("pinched", "nipped")
@@ -141,8 +140,7 @@
w_class = 2.0
//Cost to make in the autolathe
m_amt = 70
g_amt = 30
matter = list("metal" = 70, "glass" = 30)
//R&D tech level
origin_tech = "engineering=1"
@@ -395,24 +393,21 @@
/obj/item/weapon/weldingtool/largetank
name = "Industrial Welding Tool"
max_fuel = 40
m_amt = 70
g_amt = 60
matter = list("metal" = 70, "glass" = 60)
origin_tech = "engineering=2"
/obj/item/weapon/weldingtool/hugetank
name = "Upgraded Welding Tool"
max_fuel = 80
w_class = 3.0
m_amt = 70
g_amt = 120
matter = list("metal" = 70, "glass" = 120)
origin_tech = "engineering=3"
/obj/item/weapon/weldingtool/experimental
name = "Experimental Welding Tool"
max_fuel = 40
w_class = 3.0
m_amt = 70
g_amt = 120
matter = list("metal" = 70, "glass" = 120)
origin_tech = "engineering=4;phoron=3"
var/last_gen = 0
@@ -439,7 +434,7 @@
throwforce = 7.0
item_state = "crowbar"
w_class = 2.0
m_amt = 50
matter = list("metal" = 50)
origin_tech = "engineering=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
code/game/objects/objs.dm
+3 -4
View File
@@ -1,8 +1,7 @@
/obj
//var/datum/module/mod //not used
var/m_amt = 0 // metal
var/g_amt = 0 // glass
var/w_amt = 0 // waster amounts
//Used to store information about the contents of the object.
var/list/matter
var/origin_tech = null //Used by R&D to determine what research bonuses it grants.
var/reliability = 100 //Used by SOME devices to determine how reliable they are.
var/crit_fail = 0