Merge pull request #4690 from Glloyd/ear_stuff_2

A first pass at more realistic w_class values
This commit is contained in:
Mloc
2014-04-05 16:23:59 +01:00
40 changed files with 61 additions and 58 deletions
+3 -3
View File
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
w_class = 1.0
w_class = 2.0
flags = FPRINT | TABLEPASS
slot_flags = SLOT_ID | SLOT_BELT
@@ -338,7 +338,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
return
lastmode = mode
var/title = "Personal Data Assistant"
var/data[0] // This is the data that will be sent to the PDA
@@ -367,7 +367,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(mode in cartmodes)
data["records"] = cartridge.create_NanoUI_values()
if(mode == 0)
if(mode == 0)
cartdata["name"] = cartridge.name
cartdata["access"] = list(\
"access_security" = cartridge.access_security,\
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "flash"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
throwforce = 5
w_class = 1.0
w_class = 2.0
throw_speed = 4
throw_range = 10
flags = FPRINT | TABLEPASS| CONDUCT
+1 -1
View File
@@ -3,7 +3,7 @@
desc = "A device used to project your voice. Loudly."
icon_state = "megaphone"
item_state = "radio"
w_class = 1.0
w_class = 2.0
flags = FPRINT | TABLEPASS | CONDUCT
var/spamcheck = 0
+1 -1
View File
@@ -68,7 +68,7 @@ REAGENT SCANNER
flags = FPRINT | TABLEPASS | CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
w_class = 1.0
w_class = 2.0
throw_speed = 5
throw_range = 10
m_amt = 200
@@ -3,7 +3,7 @@
name = "universal recorder"
icon_state = "taperecorderidle"
item_state = "analyzer"
w_class = 1.0
w_class = 2.0
m_amt = 60
g_amt = 30
var/emagged = 0.0
+1 -1
View File
@@ -5,7 +5,7 @@
item_state = "lgloves"
force = 0
throwforce = 0
w_class = 1.0
w_class = 2.0
throw_speed = 1
throw_range = 15
var/state
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/items.dmi'
amount = 5
max_amount = 5
w_class = 1
w_class = 2
throw_speed = 4
throw_range = 20
var/heal_brute = 0
+1 -1
View File
@@ -4,7 +4,7 @@
//Added by Jack Rost
/obj/item/trash
icon = 'icons/obj/trash.dmi'
w_class = 1.0
w_class = 2.0
desc = "This is rubbish."
raisins
name = "4no raisins"
+1 -1
View File
@@ -41,7 +41,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 4
w_class = 1
w_class = 2
origin_tech = "materials=4;magnets=3;syndicate=4"
attack_verb = list("shoved", "bashed")
var/active = 0
@@ -94,7 +94,7 @@
storage_slots = 50; //the number of plant pieces it can carry.
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = 3
w_class = 1
w_class = 2
can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/grown","/obj/item/seeds","/obj/item/weapon/grown")
@@ -252,5 +252,5 @@
storage_slots = 50; //the number of cash pieces it can carry.
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * cash.w_class
max_w_class = 3
w_class = 1
w_class = 2
can_hold = list("/obj/item/weapon/coin","/obj/item/weapon/spacecash")
+2 -2
View File
@@ -6,7 +6,7 @@
flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
throwforce = 0
w_class = 1.0
w_class = 2.0
throw_speed = 7
throw_range = 15
attack_verb = list("banned")
@@ -26,7 +26,7 @@
throw_speed = 1
throw_range = 4
throwforce = 10
w_class = 1
w_class = 2
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+1 -1
View File
@@ -14,7 +14,7 @@ LINEN BINS
throwforce = 1
throw_speed = 1
throw_range = 2
w_class = 1.0
w_class = 2.0
item_color = "white"