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

Merge pull request #725 from Erthilo/master

Browse Source 
New Engineering Space Suits, health analysers detect bone fractures, pulling lying down people is slower, and some fixes
This commit is contained in:
CIB
2012-03-21 13:00:31 -07:00
parent 1dd17e60a3 331900eb87
commit bd745b5e30
15 changed files with 3272 additions and 3225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig.dm
+15 -2
View File
@@ -10,11 +10,18 @@
name = "mining RIG helmet"
icon_state = "rig-mining"
/obj/item/clothing/head/helmet/space/rig/elite
name = "advanced RIG helmet"
icon_state = "rig-white"
/obj/item/clothing/head/helmet/space/rig/engspace_helmet
name = "engineering space helmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Has radiation shielding and a visor that can be toggled on and off."
icon_state = "engspace_helmet"
item_state = "engspace_helmet"
see_face = 0.0
var/up = 0
/obj/item/clothing/head/helmet/space/rig/security
name = "security RIG helmet"
icon_state = "rig-security"
@@ -39,6 +46,12 @@
name = "advanced RIG suit"
protective_temperature = 10000
/obj/item/clothing/suit/space/rig/engspace_suit
name = "engineering space suit"
desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
icon_state = "engspace_suit"
item_state = "engspace_suit"
/obj/item/clothing/suit/space/rig/security
name = "security RIG suit"
desc = "A suit specially designed for security to offer minor protection from environmental hazards, and greater protection from human hazards"
@@ -46,4 +59,4 @@
protective_temperature = 3000
slowdown = 1
armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10)
allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton)
allowed = list(/obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse_rifle, /obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy/taser, /obj/item/weapon/melee/baton)
code/modules/mob/living/carbon/human/human.dm
+6 -2
View File
@@ -166,6 +166,7 @@
/mob/living/carbon/human/movement_delay()
var/tally = 0
var/mob/M = pulling
if(reagents.has_reagent("hyperzine")) return -1
@@ -192,10 +193,10 @@
/*if(mutations & FAT)
tally += 1.5*/
if (bodytemperature < 283.222)
if(bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
if (shock_stage >= 10) tally += 3
if(shock_stage >= 10) tally += 3
if(tally < 0)
tally = 0
@@ -203,6 +204,9 @@
if(mutations & mRun)
tally = 0
if(istype(M) && M.lying) //Pulling lying down people is slower
tally += 3
return tally
/mob/living/carbon/human/Stat()
code/modules/mob/living/silicon/robot/robot.dm
+8 -2
View File
@@ -350,7 +350,10 @@
/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
if (W:remove_fuel(0))
if(getBruteLoss() == 0)
user << "There are no dents to fix here!"
return
else if (W:remove_fuel(0))
bruteloss -= 30
if(getBruteLoss() < 0) bruteloss = 0
updatehealth()
@@ -363,8 +366,11 @@
else if(istype(W, /obj/item/weapon/cable_coil) && wiresexposed)
var/obj/item/weapon/cable_coil/coil = W
if(getFireLoss() == 0)
user << "There are no burnt wires here!"
return
else if(getFireLoss() < 0) adjustFireLoss(0)
adjustFireLoss(-30)
if(getFireLoss() < 0) adjustFireLoss(0)
updatehealth()
coil.use(1)
for(var/mob/O in viewers(user, null))