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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom

Browse Source 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
This commit is contained in:
Markolie
2015-09-15 04:18:27 +02:00
parent 6f753d776c 6fd7350746
commit 90f722d752
108 changed files with 1554 additions and 2133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/tiles/plasteel.dm
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "tile"
w_class = 3.0
force = 6.0
materials = list(MAT_METAL=937.5)
materials = list(MAT_METAL=500)
throwforce = 10.0
throw_speed = 3
throw_range = 7
code/game/objects/items/weapons/table_rack_parts.dm
+3 -3
View File
@@ -12,7 +12,7 @@
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "table_parts"
materials = list(MAT_METAL=3750)
materials = list(MAT_METAL=4000)
flags = CONDUCT
attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
@@ -21,7 +21,7 @@
desc = "Hard table parts. Well...harder..."
icon = 'icons/obj/items.dmi'
icon_state = "reinf_tableparts"
materials = list(MAT_METAL=7500)
materials = list(MAT_METAL=8000)
flags = CONDUCT
/obj/item/weapon/table_parts/wood
@@ -42,7 +42,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "rack_parts"
flags = CONDUCT
materials = list(MAT_METAL=3750)
materials = list(MAT_METAL=2000)
/*
* Table Parts
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -152,7 +152,7 @@ obj/item/weapon/wirerod
force = 9
throwforce = 10
w_class = 3
materials = list(MAT_METAL=1875)
materials = list(MAT_METAL=1000)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)