ERT equipment rework

This commit is contained in:
Markolie
2015-03-03 22:51:54 +01:00
parent a497411d89
commit 4ac1007d82
25 changed files with 14456 additions and 14220 deletions
@@ -30,6 +30,10 @@
icon_state = "sheet-glass"
g_amt = 0
created_window = /obj/structure/window/basic
/obj/item/stack/sheet/glass/full/New()
..()
amount = 50
/obj/item/stack/sheet/glass/attack_self(mob/user as mob)
construct_window(user)
@@ -81,6 +81,10 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
throwforce = 10.0
flags = CONDUCT
origin_tech = "materials=1"
/obj/item/stack/sheet/metal/full/New()
..()
amount = 50
/obj/item/stack/sheet/metal/cyborg
name = "metal"
@@ -120,8 +124,12 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
origin_tech = "materials=2"
/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
recipes = plasteel_recipes
return ..()
recipes = plasteel_recipes
return ..()
/obj/item/stack/sheet/plasteel/full/New(var/loc, var/amount=null)
amount = 50
..(loc, amount)
/*
* Wood
@@ -126,8 +126,15 @@
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
max_w_class = 3
can_hold = list("/obj/item/weapon/ore")
/obj/item/weapon/storage/bag/ore/holding //miners, your messiah has arrived
name = "mining satchel of holding"
desc = "A revolution in convenience, this satchel allows for infinite ore storage. It's been outfitted with anti-malfunction safety measures."
storage_slots = INFINITY
max_combined_w_class = INFINITY
origin_tech = "bluespace=3"
icon_state = "satchel_bspace"
// -----------------------------
// Plant bag
// -----------------------------
@@ -59,7 +59,7 @@
new /obj/item/weapon/wirecutters(src)
new /obj/item/stack/cable_coil(src,30,pick("red","yellow","orange"))
/obj/item/weapon/storage/belt/utility/full/response_team/New()
/obj/item/weapon/storage/belt/utility/full/multitool/New()
..()
new /obj/item/device/multitool(src)
@@ -133,6 +133,8 @@
/obj/item/weapon/storage/belt/security/response_team/New()
..()
contents.Cut()
new /obj/item/weapon/kitchenknife/combat(src)
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/grenade/flashbang(src)
new /obj/item/weapon/melee/telebaton(src)
@@ -170,7 +172,7 @@
/obj/item/weapon/storage/belt/military
name = "military belt"
desc = "A syndicate belt designed to be used by boarding parties. Its style is modeled after the hardsuits they wear."
desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear."
icon_state = "militarybelt"
item_state = "military"
@@ -189,6 +191,15 @@
"/obj/item/weapon/soap",
"/obj/item/weapon/holosign_creator"
)
/obj/item/weapon/storage/belt/janitor/full/New()
..()
new /obj/item/device/lightreplacer(src)
new /obj/item/weapon/holosign_creator(src)
new /obj/item/weapon/reagent_containers/spray(src)
new /obj/item/weapon/soap(src)
new /obj/item/weapon/grenade/chem_grenade/cleaner(src)
new /obj/item/weapon/grenade/chem_grenade/cleaner(src)
/obj/item/weapon/storage/belt/bandolier
name = "bandolier"
@@ -61,18 +61,6 @@
new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
return
/obj/item/weapon/storage/box/response_team
New()
..()
contents = list()
sleep(1)
new /obj/item/clothing/mask/breath( src )
new /obj/item/weapon/tank/emergency_oxygen/double/full( src )
new /obj/item/clothing/glasses/night( src )
new /obj/item/weapon/kitchenknife/combat( src ) // SURVIVAL KNIFE, FOR CARVING A BOW OUT OF THE BONES OF ASSISTANTS AFTER YOU CRASH-LAND ON THE STATION.
new /obj/item/weapon/reagent_containers/hypospray/autoinjector( src )
return
/obj/item/weapon/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
+4 -1
View File
@@ -12,7 +12,10 @@
var/datum/reagents/R = new/datum/reagents(100)
reagents = R
R.my_atom = src
/obj/structure/mopbucket/full/New()
..()
reagents.add_reagent("water", 100)
/obj/structure/mopbucket/examine()
set src in usr