cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 23:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor

Browse Source
This commit is contained in:
Anewbe
2018-02-17 15:22:28 -06:00
parent 4c38647095 7cc8fa0cba
commit b7658d49ab
14 changed files with 109 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/suit_cooling.dm
+9 -3
View File
@@ -46,9 +46,15 @@
var/mob/living/carbon/human/H = loc
var/efficiency = 1 - H.get_pressure_weakness() //you need to have a good seal for effective cooling
var/env_temp = get_environment_temperature() //wont save you from a fire
var/temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
var/efficiency = 1 - H.get_pressure_weakness() // You need to have a good seal for effective cooling
var/temp_adj = 0 // How much the unit cools you. Adjusted later on.
var/env_temp = get_environment_temperature() // This won't save you from a fire
var/thermal_protection = H.get_heat_protection(env_temp) // ... unless you've got a good suit.
if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1.
temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
else
temp_adj = min(H.bodytemperature - thermostat, max_cooling)
if (temp_adj < 0.5) //only cools, doesn't heat, also we don't need extreme precision
return
code/game/objects/items/stacks/marker_beacons.dm
+1
View File
@@ -25,6 +25,7 @@ var/list/marker_beacon_colors = list(
icon_state = "marker"
max_amount = 100
no_variants = TRUE
w_class = ITEMSIZE_SMALL
var/picked_color = "random"
/obj/item/stack/marker_beacon/ten
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+31
View File
@@ -67,3 +67,34 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/cargo(src)
new /obj/item/clothing/shoes/boots/winter/supply(src)
return
/obj/structure/closet/secure_closet/miner
name = "miner's equipment"
icon_state = "miningsec1"
icon_closed = "miningsec"
icon_locked = "miningsec1"
icon_opened = "miningsecopen"
icon_broken = "miningsecbroken"
icon_off = "miningsecoff"
req_access = list(access_mining)
/obj/structure/closet/secure_closet/miner/New()
..()
sleep(2)
if(prob(50))
new /obj/item/weapon/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel/eng(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/under/rank/miner(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/analyzer(src)
new /obj/item/weapon/storage/bag/ore(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/weapon/shovel(src)
new /obj/item/weapon/pickaxe(src)
new /obj/item/clothing/glasses/material(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/miner(src)
new /obj/item/clothing/shoes/boots/winter/mining(src)
new /obj/item/stack/marker_beacon/thirty(src)