mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 21:49:11 +01:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into steals_more_armor
This commit is contained in:
Anewbe
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
@@ -1,35 +1,3 @@
|
||||
/**********************Miner Lockers**************************/
|
||||
|
||||
/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)
|
||||
|
||||
/******************************Lantern*******************************/
|
||||
|
||||
/obj/item/device/flashlight/lantern
|
||||
|
||||
@@ -616,11 +616,11 @@
|
||||
var/temp_adj = 0
|
||||
if(loc_temp < bodytemperature) //Place is colder than we are
|
||||
var/thermal_protection = get_cold_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
|
||||
if(thermal_protection < 1)
|
||||
if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1.
|
||||
temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR) //this will be negative
|
||||
else if (loc_temp > bodytemperature) //Place is hotter than we are
|
||||
var/thermal_protection = get_heat_protection(loc_temp) //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
|
||||
if(thermal_protection < 1)
|
||||
if(thermal_protection < 0.99) //For some reason, < 1 returns false if the value is 1.
|
||||
temp_adj = (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
|
||||
|
||||
//Use heat transfer as proportional to the gas density. However, we only care about the relative density vs standard 101 kPa/20 C air. Therefore we can use mole ratios
|
||||
|
||||
@@ -53,6 +53,39 @@
|
||||
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
<h2 class="date">17 February 2018</h2>
|
||||
<h3 class="author">Anewbe updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with the random spawner.</li>
|
||||
<li class="rscadd">Mines now give a visible message when they go off.</li>
|
||||
<li class="tweak">Land mines on the ground can no longer be told apart from one another, to prevent gaming the system.</li>
|
||||
<li class="bugfix">Hovering mobs (viscerators, drones, Poly, carp) no longer set off land mines.</li>
|
||||
<li class="tweak">Arming a land mine now takes concentration. If you move, it will boom.</li>
|
||||
<li class="tweak">RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE.</li>
|
||||
<li class="tweak">BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES.</li>
|
||||
<li class="rscadd">Cyborg Chargers now decrease radiation on FBPs.</li>
|
||||
<li class="tweak">Falling one floor now does a lot less damage, on average.</li>
|
||||
<li class="bugfix">Falling one floor in a Mech no longer hurts the occupant.</li>
|
||||
</ul>
|
||||
<h3 class="author">PrismaticGynoid updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics, and virology machines.</li>
|
||||
<li class="tweak">Changed department ponchos to be open to any job, just like department jackets.</li>
|
||||
</ul>
|
||||
<h3 class="author">Schnayy updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Adds bouquets. Can be ordered via 'gift crate' in cargo.</li>
|
||||
<li class="rscadd">Adds fake bouquets for the cheap. Can currently be won from arcade machines.</li>
|
||||
<li class="rscadd">Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in cargo.</li>
|
||||
<li class="rscadd">Adds gift cards with four cover variations. Function like paper. Can be ordered via 'gift crate' in cargo.</li>
|
||||
</ul>
|
||||
<h3 class="author">battlefieldCommander updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added packed snow brick material. Craft it using snow piles.</li>
|
||||
<li class="recadd">Added snow girders and igloo walls. Craft them using snow bricks.</li>
|
||||
<li class="rscadd">Added various snowmen. Craft them using snow piles. Punch 'em to destroy.</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">10 February 2018</h2>
|
||||
<h3 class="author">Atermonera updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
|
||||
@@ -3868,3 +3868,35 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- maptweak: Redesign of medical surgery rooms, replacement of the closets with wall
|
||||
closets.
|
||||
- bugfix: Multiple map bugfixes including distro and scrubber lines to deck 3.
|
||||
2018-02-17:
|
||||
Anewbe:
|
||||
- rscadd: Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with
|
||||
the random spawner.
|
||||
- rscadd: Mines now give a visible message when they go off.
|
||||
- tweak: Land mines on the ground can no longer be told apart from one another,
|
||||
to prevent gaming the system.
|
||||
- bugfix: Hovering mobs (viscerators, drones, Poly, carp) no longer set off land
|
||||
mines.
|
||||
- tweak: Arming a land mine now takes concentration. If you move, it will boom.
|
||||
- tweak: RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE.
|
||||
- tweak: BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS
|
||||
DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES.
|
||||
- rscadd: Cyborg Chargers now decrease radiation on FBPs.
|
||||
- tweak: Falling one floor now does a lot less damage, on average.
|
||||
- bugfix: Falling one floor in a Mech no longer hurts the occupant.
|
||||
PrismaticGynoid:
|
||||
- rscadd: A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics,
|
||||
and virology machines.
|
||||
- tweak: Changed department ponchos to be open to any job, just like department
|
||||
jackets.
|
||||
Schnayy:
|
||||
- rscadd: Adds bouquets. Can be ordered via 'gift crate' in cargo.
|
||||
- rscadd: Adds fake bouquets for the cheap. Can currently be won from arcade machines.
|
||||
- rscadd: Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in
|
||||
cargo.
|
||||
- rscadd: Adds gift cards with four cover variations. Function like paper. Can be
|
||||
ordered via 'gift crate' in cargo.
|
||||
battlefieldCommander:
|
||||
- rscadd: Added packed snow brick material. Craft it using snow piles.
|
||||
- recadd: Added snow girders and igloo walls. Craft them using snow bricks.
|
||||
- rscadd: Added various snowmen. Craft them using snow piles. Punch 'em to destroy.
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Anewbe
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- tweak: "RINGS AND CERTAIN GLOVES INCREASE PUNCHING DAMAGE."
|
||||
- tweak: "BRASS KNUCKLES HAVE BEEN TURNED INTO GLOVES AND REBALANCED. THEY DO LESS DAMAGE PER HIT BECAUSE IT'S HARD TO DISARM A PAIR OF GLOVES."
|
||||
@@ -1,40 +0,0 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Anewbe
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added a random mine spawner, for use in PoIs. Replaces mines in PoIs with the random spawner."
|
||||
- rscadd: "Mines now give a visible message when they go off."
|
||||
- tweak: "Land mines on the ground can no longer be told apart from one another, to prevent gaming the system."
|
||||
- bugfix: "Hovering mobs (viscerators, drones, Poly, carp) no longer set off land mines."
|
||||
- tweak: "Arming a land mine now takes concentration. If you move, it will boom."
|
||||
@@ -33,6 +33,4 @@ delete-after: True
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Cyborg Chargers now decrease radiation on FBPs."
|
||||
- tweak: "Falling one floor now does a lot less damage, on average."
|
||||
- bugfix: "Falling one floor in a Mech no longer hurts the occupant."
|
||||
- bugfix: "Suit Coolers now properly cool FBPs in slightly burning rooms. If it gets too hot for your suit, you're still dead."
|
||||
@@ -1,38 +0,0 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: battlefieldCommander
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- rscadd: "Added packed snow brick material. Craft it using snow piles."
|
||||
- recadd: "Added snow girders and igloo walls. Craft them using snow bricks."
|
||||
- rscadd: "Added various snowmen. Craft them using snow piles. Punch 'em to destroy."
|
||||
@@ -1,4 +0,0 @@
|
||||
author: PrismaticGynoid
|
||||
delete-after: True
|
||||
changes:
|
||||
- rscadd: "A lot more machines can now be moved with a wrench, mostly kitchen, hydroponics, and virology machines."
|
||||
@@ -1,4 +0,0 @@
|
||||
author: PrismaticGynoid
|
||||
delete-after: True
|
||||
changes:
|
||||
- tweak: "Changed department ponchos to be open to any job, just like department jackets."
|
||||
@@ -1,9 +0,0 @@
|
||||
author: Schnayy
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- rscadd: "Adds bouquets. Can be ordered via 'gift crate' in cargo."
|
||||
- rscadd: "Adds fake bouquets for the cheap. Can currently be won from arcade machines."
|
||||
- rscadd: "Adds chocolate heart-shaped boxes. Can be ordered via 'gift crate' in cargo."
|
||||
- rscadd: "Adds gift cards with four cover variations. Function like paper. Can be ordered via 'gift crate' in cargo."
|
||||
Reference in New Issue
Block a user