mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 02:09:41 +00:00
Axes old wire, fixes costs in lathe
This commit is contained in:
@@ -269,21 +269,6 @@
|
|||||||
throw_range = 5
|
throw_range = 5
|
||||||
w_class = 2.0
|
w_class = 2.0
|
||||||
|
|
||||||
/obj/item/weapon/wire
|
|
||||||
desc = "This is just a simple piece of regular insulated wire."
|
|
||||||
name = "wire"
|
|
||||||
icon = 'icons/obj/power.dmi'
|
|
||||||
icon_state = "item_wire"
|
|
||||||
var/amount = 1.0
|
|
||||||
var/laying = 0.0
|
|
||||||
var/old_lay = null
|
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 40)
|
|
||||||
attack_verb = list("whipped", "lashed", "disciplined", "tickled")
|
|
||||||
|
|
||||||
suicide_act(mob/user)
|
|
||||||
viewers(user) << "<span class='warning'><b>[user] is strangling \himself with \the [src]! It looks like \he's trying to commit suicide.</b></span>"
|
|
||||||
return (OXYLOSS)
|
|
||||||
|
|
||||||
/obj/item/weapon/module
|
/obj/item/weapon/module
|
||||||
icon = 'icons/obj/module.dmi'
|
icon = 'icons/obj/module.dmi'
|
||||||
icon_state = "std_module"
|
icon_state = "std_module"
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
throwforce = 15.0
|
throwforce = 15.0
|
||||||
throw_speed = 5
|
throw_speed = 5
|
||||||
throw_range = 20
|
throw_range = 20
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 1875)
|
matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2)
|
||||||
max_amount = 60
|
max_amount = 60
|
||||||
attack_verb = list("hit", "bludgeoned", "whacked")
|
attack_verb = list("hit", "bludgeoned", "whacked")
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,7 @@
|
|||||||
desc = "Those could work as a pretty decent throwing weapon" //why?
|
desc = "Those could work as a pretty decent throwing weapon" //why?
|
||||||
icon_state = "tile"
|
icon_state = "tile"
|
||||||
force = 6.0
|
force = 6.0
|
||||||
matter = list(DEFAULT_WALL_MATERIAL = 937.5)
|
matter = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 4)
|
||||||
throwforce = 15.0
|
throwforce = 15.0
|
||||||
throw_speed = 5
|
throw_speed = 5
|
||||||
throw_range = 20
|
throw_range = 20
|
||||||
@@ -92,13 +92,13 @@
|
|||||||
name = "steel floor tile"
|
name = "steel floor tile"
|
||||||
singular_name = "steel floor tile"
|
singular_name = "steel floor tile"
|
||||||
icon_state = "tile_steel"
|
icon_state = "tile_steel"
|
||||||
matter = list("plasteel" = 937.5)
|
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
|
||||||
|
|
||||||
/obj/item/stack/tile/floor_white
|
/obj/item/stack/tile/floor_white
|
||||||
name = "white floor tile"
|
name = "white floor tile"
|
||||||
singular_name = "white floor tile"
|
singular_name = "white floor tile"
|
||||||
icon_state = "tile_white"
|
icon_state = "tile_white"
|
||||||
matter = list("plastic" = 937.5)
|
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
|
||||||
|
|
||||||
/obj/item/stack/tile/floor_yellow
|
/obj/item/stack/tile/floor_yellow
|
||||||
name = "yellow floor tile"
|
name = "yellow floor tile"
|
||||||
@@ -110,13 +110,13 @@
|
|||||||
name = "dark floor tile"
|
name = "dark floor tile"
|
||||||
singular_name = "dark floor tile"
|
singular_name = "dark floor tile"
|
||||||
icon_state = "fr_tile"
|
icon_state = "fr_tile"
|
||||||
matter = list("plasteel" = 937.5)
|
matter = list("plasteel" = SHEET_MATERIAL_AMOUNT / 4)
|
||||||
|
|
||||||
/obj/item/stack/tile/floor_freezer
|
/obj/item/stack/tile/floor_freezer
|
||||||
name = "freezer floor tile"
|
name = "freezer floor tile"
|
||||||
singular_name = "freezer floor tile"
|
singular_name = "freezer floor tile"
|
||||||
icon_state = "tile_freezer"
|
icon_state = "tile_freezer"
|
||||||
matter = list("plastic" = 937.5)
|
matter = list("plastic" = SHEET_MATERIAL_AMOUNT / 4)
|
||||||
|
|
||||||
/obj/item/stack/tile/floor/cyborg
|
/obj/item/stack/tile/floor/cyborg
|
||||||
name = "floor tile synthesizer"
|
name = "floor tile synthesizer"
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
// WIRES
|
|
||||||
|
|
||||||
/obj/item/weapon/wire/proc/update()
|
|
||||||
if (src.amount > 1)
|
|
||||||
src.icon_state = "spool_wire"
|
|
||||||
src.desc = text("This is just spool of regular insulated wire. It consists of about [] unit\s of wire.", src.amount)
|
|
||||||
else
|
|
||||||
src.icon_state = "item_wire"
|
|
||||||
src.desc = "This is just a simple piece of regular insulated wire."
|
|
||||||
return
|
|
||||||
|
|
||||||
/obj/item/weapon/wire/attack_self(mob/user as mob)
|
|
||||||
if (src.laying)
|
|
||||||
src.laying = 0
|
|
||||||
user << "<span class='notice'>You're done laying wire!</span>"
|
|
||||||
else
|
|
||||||
user << "<span class='warning'>You are not using this to lay wire...</span>"
|
|
||||||
return
|
|
||||||
@@ -356,7 +356,7 @@ var/list/name_to_material
|
|||||||
hardness = 80
|
hardness = 80
|
||||||
weight = 23
|
weight = 23
|
||||||
stack_origin_tech = list(TECH_MATERIAL = 2)
|
stack_origin_tech = list(TECH_MATERIAL = 2)
|
||||||
composite_material = list(DEFAULT_WALL_MATERIAL = 3750, "platinum" = 3750) //todo
|
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo
|
||||||
|
|
||||||
/material/plasteel/titanium
|
/material/plasteel/titanium
|
||||||
name = "titanium"
|
name = "titanium"
|
||||||
@@ -467,7 +467,7 @@ var/list/name_to_material
|
|||||||
hardness = 40
|
hardness = 40
|
||||||
weight = 30
|
weight = 30
|
||||||
stack_origin_tech = "materials=2"
|
stack_origin_tech = "materials=2"
|
||||||
composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
|
composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT / 2, "glass" = SHEET_MATERIAL_AMOUNT)
|
||||||
window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5)
|
window_options = list("One Direction" = 1, "Full Window" = 4, "Windoor" = 5)
|
||||||
created_window = /obj/structure/window/reinforced
|
created_window = /obj/structure/window/reinforced
|
||||||
wire_product = null
|
wire_product = null
|
||||||
|
|||||||
@@ -674,7 +674,6 @@
|
|||||||
#include "code\game\objects\items\weapons\trays.dm"
|
#include "code\game\objects\items\weapons\trays.dm"
|
||||||
#include "code\game\objects\items\weapons\weaponry.dm"
|
#include "code\game\objects\items\weapons\weaponry.dm"
|
||||||
#include "code\game\objects\items\weapons\weldbackpack.dm"
|
#include "code\game\objects\items\weapons\weldbackpack.dm"
|
||||||
#include "code\game\objects\items\weapons\wires.dm"
|
|
||||||
#include "code\game\objects\items\weapons\circuitboards\broken.dm"
|
#include "code\game\objects\items\weapons\circuitboards\broken.dm"
|
||||||
#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm"
|
#include "code\game\objects\items\weapons\circuitboards\circuitboard.dm"
|
||||||
#include "code\game\objects\items\weapons\circuitboards\mecha.dm"
|
#include "code\game\objects\items\weapons\circuitboards\mecha.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user