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

Moved para and sleepy pen defines out of weapon.dm.

Browse Source 
Updated flashlight code a little.
Added inhand sprites for desk lamps.
Standardised modules/paperwork.
Decapitalised a bunch of mining items.
Slightly reverted update_icons.dm, so we're not looping through mutations more than we need to. Also, skeletons can now wear lipstick!

A few other things which aren't worth listing individually.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4855 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-10-13 14:37:28 +00:00
parent 92650f1464
commit c4f9b43020
19 changed files with 222 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/mine_items.dm
+16 -30
View File
@@ -10,7 +10,7 @@
/**********************Miner Lockers**************************/
/obj/structure/closet/secure_closet/miner
name = "Miner's Equipment"
name = "miner's equipment"
icon_state = "miningsec1"
icon_closed = "miningsec"
icon_locked = "miningsec1"
@@ -95,7 +95,7 @@ proc/move_mining_shuttle()
return
/obj/machinery/computer/mining_shuttle
name = "Mining Shuttle Console"
name = "mining shuttle console"
icon = 'icons/obj/computer.dmi'
icon_state = "shuttle"
req_access = list(access_mining)
@@ -158,29 +158,15 @@ proc/move_mining_shuttle()
/******************************Lantern*******************************/
/obj/item/device/flashlight/lantern
name = "Mining Lantern"
icon_state = "lantern-off"
desc = "A miner's lantern"
anchored = 0
icon_on = "lantern-on"
icon_off = "lantern-off"
var/brightness = 12 // luminosity when on
/obj/item/device/flashlight/lantern/New()
luminosity = 0
on = 0
return
/obj/item/device/flashlight/lantern/attack_self(mob/user)
src.add_fingerprint(user)
on = !on
update_brightness(user)
return
name = "lantern"
icon_state = "lantern"
desc = "A mining lantern."
brightness_on = 6 // luminosity when on
/*****************************Pickaxe********************************/
/obj/item/weapon/pickaxe
name = "Miner's pickaxe"
name = "pickaxe"
icon = 'icons/obj/items.dmi'
icon_state = "pickaxe"
flags = FPRINT | TABLEPASS| CONDUCT
@@ -195,12 +181,12 @@ proc/move_mining_shuttle()
attack_verb = list("hit", "pierced", "sliced", "attacked")
hammer
name = "Mining Sledge Hammer"
name = "sledgehammer"
//icon_state = "sledgehammer" Waiting on sprite
desc = "A mining hammer made of reinforced metal. You feel like smashing your boss in the face with this."
silver
name = "Silver Pickaxe"
name = "silver pickaxe"
icon_state = "spickaxe"
item_state = "spickaxe"
digspeed = 30
@@ -208,7 +194,7 @@ proc/move_mining_shuttle()
desc = "This makes no metallurgic sense."
drill
name = "Mining Drill" // Can dig sand as well!
name = "mining drill" // Can dig sand as well!
icon_state = "handdrill"
item_state = "jackhammer"
digspeed = 30
@@ -216,7 +202,7 @@ proc/move_mining_shuttle()
desc = "Yours is the drill that will pierce through the rock walls."
jackhammer
name = "Sonic Jackhammer"
name = "sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
digspeed = 20 //faster than drill, but cannot dig
@@ -224,7 +210,7 @@ proc/move_mining_shuttle()
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
gold
name = "Golden Pickaxe"
name = "golden pickaxe"
icon_state = "gpickaxe"
item_state = "gpickaxe"
digspeed = 20
@@ -232,7 +218,7 @@ proc/move_mining_shuttle()
desc = "This makes no metallurgic sense."
plasmacutter
name = "Plasma Cutter"
name = "plasma cutter"
icon_state = "plasmacutter"
item_state = "gun"
w_class = 3.0 //it is smaller than the pickaxe
@@ -242,7 +228,7 @@ proc/move_mining_shuttle()
desc = "A rock cutter that uses bursts of hot plasma. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
diamond
name = "Diamond Pickaxe"
name = "diamond pickaxe"
icon_state = "dpickaxe"
item_state = "dpickaxe"
digspeed = 10
@@ -250,7 +236,7 @@ proc/move_mining_shuttle()
desc = "A pickaxe with a diamond pick head, this is just like minecraft."
diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
name = "Diamond Mining Drill"
name = "diamond mining drill"
icon_state = "diamonddrill"
item_state = "jackhammer"
digspeed = 5 //Digs through walls, girders, and can dig up sand
@@ -258,7 +244,7 @@ proc/move_mining_shuttle()
desc = "Yours is the drill that will pierce the heavens!"
borgdrill
name = "Cyborg Mining Drill"
name = "cyborg mining drill"
icon_state = "diamonddrill"
item_state = "jackhammer"
digspeed = 15