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

-Balancing everything I did not balance before

Browse Source 
-Uzis now fire a bullet that does 32 damage instead of 51

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2052 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uhangi@gmail.com
2011-08-27 22:16:52 +00:00
parent 444f3f629b
commit 8722ab0b8e
3 changed files with 69 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/head.dm
+56 -16
View File
@@ -13,19 +13,19 @@
desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation"
radiation_protection = 0.35
flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 60, rad = 100)
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 100)
/obj/item/clothing/head/bomb_hood
name = "bomb hood"
desc = "Use in case of bomb."
icon_state = "bombsuit"
flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH
armor = list(melee = 20, bullet = 10, laser = 10, taser = 5, bomb = 100, bio = 0, rad = 0)
armor = list(melee = 20, bullet = 5, laser = 10, taser = 5, bomb = 100, bio = 0, rad = 0)
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
item_state = "bombsuitsec"
armor = list(melee = 50, bullet = 40, laser = 20, taser = 5, bomb = 100, bio = 0, rad = 0)
armor = list(melee = 50, bullet = 5, laser = 20, taser = 5, bomb = 100, bio = 0, rad = 0)
/obj/item/clothing/head/bio_hood
name = "bio hood"
@@ -43,7 +43,7 @@
/obj/item/clothing/head/bio_hood/security
icon_state = "bio_security"
armor = list(melee = 30, bullet = 20, laser = 10, taser = 5, bomb = 20, bio = 100, rad = 20)
armor = list(melee = 30, bullet = 5, laser = 10, taser = 5, bomb = 20, bio = 100, rad = 20)
/obj/item/clothing/head/bio_hood/janitor
icon_state = "bio_janitor"
@@ -151,6 +151,7 @@
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES
item_state = "helmet"
armor = list(melee = 75, bullet = 10, laser = 50, taser = 10, bomb = 25, bio = 10, rad = 0)
protective_temperature = 500
heat_transfer_coefficient = 0.10
@@ -171,6 +172,38 @@
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 25, rad = 25)
/obj/item/clothing/head/helmet/space/engineering
name = "Engineering space helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Painted in Engineering Orange to designate its department of origin."
icon_state = "helm_engineering0"
item_state = "helm-orange"
var/brightness_on = 4
var/on = 0
radiation_protection = 0.25
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
/obj/item/clothing/head/helmet/space/command
name = "Command space helmet"
desc = "A special helmet designed to work in a hazardous, low-pressure environment. Painted in Command Blue to designate its department of origin."
icon_state = "helm-command"
item_state = "helm-command"
radiation_protection = 0.25
armor = list(melee = 40, bullet = 20, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
/obj/item/clothing/head/helmet/space/command/chief_engineer
name = "Chief engineer space helmet"
desc = "A special helmet designed to work in a hazardous, low-pressure environment. Bears the insignia of the chief engineer."
icon_state = "helm_ce0"
item_state = "helm-ce"
var/brightness_on = 4
var/on = 0
/obj/item/clothing/head/helmet/space/command/chief_medical_officer
name = "Chief medical offier space helmet"
desc = "A special helmet designed to work in a hazardous, low-pressure environment. Bears the insignia of the chief medical officer."
icon_state = "helm-cmo"
item_state = "helm-cmo"
/obj/item/clothing/head/helmet/space/capspace
name = "space helmet"
icon_state = "capspace"
@@ -181,6 +214,13 @@
permeability_coefficient = 0.01
armor = list(melee = 60, bullet = 50, laser = 50, taser = 25, bomb = 50, bio = 20, rad = 20)
/obj/item/clothing/head/helmet/space/rig
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
name = "rig helmet"
icon_state = "rig"
item_state = "rig_helm"
radiation_protection = 0.25
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
/obj/item/clothing/head/helmet/space/syndicate
name = "red space helmet"
@@ -212,15 +252,15 @@
icon_state = "syndicate-helm-green-dark"
item_state = "syndicate-helm-green-dark"
/obj/item/clothing/head/helmet/space/syndicate/orange
/*/obj/item/clothing/head/helmet/space/syndicate/orange
name = "Orange Space Helmet"
icon_state = "syndicate-helm-orange"
item_state = "syndicate-helm-orange"
item_state = "syndicate-helm-orange"*/ //As I said: Best used for engineering suits
/obj/item/clothing/head/helmet/space/syndicate/blue
/*/obj/item/clothing/head/helmet/space/syndicate/blue
name = "Blue Space Helmet"
icon_state = "syndicate-helm-blue"
item_state = "syndicate-helm-blue"
item_state = "syndicate-helm-blue"*/
/obj/item/clothing/head/helmet/space/syndicate/black
name = "Black Space Helmet"
@@ -237,10 +277,10 @@
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
/obj/item/clothing/head/helmet/space/syndicate/black/med
/*/obj/item/clothing/head/helmet/space/syndicate/black/med
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-med"
item_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"*/
/obj/item/clothing/head/helmet/space/syndicate/black/orange
name = "Black Space Helmet"
@@ -252,10 +292,10 @@
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
obj/item/clothing/head/helmet/space/syndicate/black/engie
/*/obj/item/clothing/head/helmet/space/syndicate/black/engie
name = "Black Space Helmet"
icon_state = "syndicate-helm-black-engie"
item_state = "syndicate-helm-black"
item_state = "syndicate-helm-black"*/
/obj/item/clothing/head/syndicatefake
name = "red space helmet replica"
@@ -319,7 +359,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/engie
var/brightness_on = 4 //luminosity when on
var/on = 0
color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite)
armor = list(melee = 30, bullet = 30, laser = 20, taser = 10, bomb = 20, bio = 10, rad = 20)
armor = list(melee = 30, bullet = 5, laser = 20, taser = 10, bomb = 20, bio = 10, rad = 20)
/obj/item/clothing/head/helmet/hardhat/orange
icon_state = "hardhat0_orange"
@@ -353,7 +393,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/engie
m_amt = 3000
g_amt = 1000
var/up = 0
armor = list(melee = 10, bullet = 10, laser = 10, taser = 5, bomb = 10, bio = 5, rad = 10)
armor = list(melee = 10, bullet = 5, laser = 10, taser = 5, bomb = 10, bio = 5, rad = 10)
/obj/item/clothing/head/helmet/HoS
name = "HoS Hat"
@@ -368,7 +408,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/engie
desc = "Stop right there, criminal scum!"
icon_state = "policehelm"
flags = FPRINT | TABLEPASS | SUITSPACE | HEADCOVERSEYES
armor = list(melee = 70, bullet = 50, laser = 40, taser = 10, bomb = 25, bio = 10, rad = 0)
armor = list(melee = 70, bullet = 10, laser = 40, taser = 10, bomb = 25, bio = 10, rad = 0)
/obj/item/clothing/head/helmet/that
name = "Sturdy Top hat"
@@ -392,7 +432,7 @@ obj/item/clothing/head/helmet/space/syndicate/black/engie
icon_state = "riot"
item_state = "helmet"
flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES
armor = list(melee = 82, bullet = 10, laser = 5, taser = 5, bomb = 5, bio = 2, rad = 0)
armor = list(melee = 82, bullet = 15, laser = 5, taser = 5, bomb = 5, bio = 2, rad = 0)
code/defines/obj/clothing/suit.dm
+4 -4
View File
@@ -218,7 +218,7 @@
icon_state = "wizard-fake"
item_state = "wizrobe"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //It's not magic, shit is reasonable. --NEO
armor = list(melee = 5, bullet = 5, laser = 5, taser = 5, bomb = 5, bio = 5, rad = 5)
armor = list(melee = 5, bullet = 0, laser = 5, taser = 5, bomb = 5, bio = 5, rad = 5)
/obj/item/clothing/suit/wizrobe/marisa
name = "Witch Robe"
@@ -449,7 +449,7 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 3
armor = list(melee = 20, bullet = 15, laser = 10, taser = 3, bomb = 15, bio = 30, rad = 40)
armor = list(melee = 20, bullet = 5, laser = 10, taser = 3, bomb = 15, bio = 30, rad = 40)
/obj/item/clothing/head/helmet/space/rig
@@ -457,7 +457,7 @@
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding."
icon_state = "rig-engineering"
item_state = "rig_helm"
armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
allowed = list(/obj/item/device/flashlight)
/obj/item/clothing/head/helmet/space/rig/mining
@@ -471,7 +471,7 @@
item_state = "rig_suit"
radiation_protection = 0.50
slowdown = 2
armor = list(melee = 40, bullet = 30, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
armor = list(melee = 40, bullet = 5, laser = 20, taser = 5, bomb = 35, bio = 50, rad = 50)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/satchel,/obj/item/device/t_scanner)
/obj/item/clothing/suit/space/rig/mining
code/game/objects/items/weapons/guns_new.dm
+9 -1
View File
@@ -54,6 +54,14 @@
effects["stutter"] = 5
effects["eyeblur"] = 5
midbullet
damage = 8
mobdamage = list(BRUTE = 32, BURN = 0, TOX = 0, OXY = 0, CLONE = 0)
New()
..()
effects["weak"] = 10
effects["stun"] = 10
suffocationbullet
damage = 65
@@ -381,7 +389,7 @@
caliber = ".45"
New()
BB = new /obj/item/projectile(src)
BB = new /obj/item/projectile/midbullet(src)
pixel_x = rand(-10.0, 10)
pixel_y = rand(-10.0, 10)
dir = pick(cardinal)