cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

Browse Source 
# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm
This commit is contained in:
Arokha Sieyes
2018-02-18 00:25:36 -06:00
parent b1b2551b9c 09f7f798d3
commit 5967bb6dc5
34 changed files with 85104 additions and 2753 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/items/weapons/storage/boxes.dm
+18 -29
View File
@@ -52,37 +52,26 @@
new foldable(get_turf(src))
qdel(src)
/obj/item/weapon/storage/box/survival //VOREStation Add for Tether Size boxes
max_w_class = ITEMSIZE_NORMAL
max_storage_space = 6 //This is just the right number, there's no constant.
/obj/item/weapon/storage/box/survival
name = "emergency supply box"
desc = "A survival box issued to crew members for use in emergency situations."
starts_with = list(
/obj/item/clothing/glasses/goggles, //VOREStation Add - Goggles for the phoron atmosphere.
/obj/item/clothing/mask/breath
)
/obj/item/weapon/storage/box/survival/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/emergency/oxygen(src)
new /obj/item/clothing/glasses/goggles(src)
/obj/item/weapon/storage/box/survival/comp
name = "emergency supply box"
desc = "A comprehensive survival box issued to crew members for use in emergency situations. Contains additional supplies."
icon_state = "survival"
starts_with = list(
/obj/item/weapon/reagent_containers/hypospray/autoinjector,
/obj/item/stack/medical/bruise_pack,
/obj/item/device/flashlight/glowstick,
/obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar,
/obj/item/clothing/mask/breath
)
/obj/item/weapon/storage/box/synth //VOREStation Add for Tether Size boxes
max_w_class = ITEMSIZE_NORMAL
max_storage_space = 6 //This is just the right number, there's no constant.
/obj/item/weapon/storage/box/synth/New()
..()
new /obj/item/clothing/glasses/goggles(src)
//VOREStation Edit
/obj/item/weapon/storage/box/vox/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/emergency/phoron_double(src)
new /obj/item/clothing/glasses/goggles(src)
/obj/item/weapon/storage/box/engineer/New()
..()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/emergency/oxygen/engi(src)
new /obj/item/clothing/glasses/goggles(src)
//VOREStation Edit End
/obj/item/weapon/storage/box/gloves
name = "box of latex gloves"
desc = "Contains white gloves."
code/game/objects/items/weapons/storage/storage.dm
+19 -9
View File
@@ -35,6 +35,7 @@
var/allow_quick_gather //Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile.
var/collection_mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/use_sound = "rustle" //sound played when used. null for no sound.
var/list/starts_with //Things to spawn on the box on spawn
/obj/item/weapon/storage/Destroy()
close_all()
@@ -52,7 +53,7 @@
if(!canremove)
return
if (ishuman(usr) || issmall(usr) || isanimal(usr) || isobserver(usr)) //so monkeys can take off their backpacks -- Urist
if (isliving(usr) || isobserver(usr))
if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech. why?
return
@@ -523,7 +524,8 @@
for(var/obj/item/I in contents)
remove_from_storage(I, T)
/obj/item/weapon/storage/New()
/obj/item/weapon/storage/initialize()
. = ..()
if(allow_quick_empty)
verbs += /obj/item/weapon/storage/verb/quick_empty
@@ -535,12 +537,6 @@
else
verbs -= /obj/item/weapon/storage/verb/toggle_gathering_mode
spawn(5)
var/total_storage_space = 0
for(var/obj/item/I in contents)
total_storage_space += I.get_storage_cost()
max_storage_space = max(total_storage_space,max_storage_space) //Prevents spawned containers from being too small for their contents.
src.boxes = new /obj/screen/storage( )
src.boxes.name = "storage"
src.boxes.master = src
@@ -579,7 +575,21 @@
src.closer.icon_state = "storage_close"
src.closer.hud_layerise()
orient2hud()
return
if(LAZYLEN(starts_with))
for(var/newtype in starts_with)
var/count = starts_with[newtype] || 1 //Could have left it blank.
while(count)
count--
new newtype(src)
calibrate_size()
/obj/item/weapon/storage/proc/calibrate_size()
var/total_storage_space = 0
for(var/obj/item/I in contents)
total_storage_space += I.get_storage_cost()
max_storage_space = max(total_storage_space,max_storage_space) //Prevents spawned containers from being too small for their contents.
/obj/item/weapon/storage/emp_act(severity)
if(!istype(src.loc, /mob/living))
code/game/objects/items/weapons/tanks/tank_types.dm
+2 -2
View File
@@ -186,8 +186,8 @@
src.air_contents.adjust_gas("phoron", (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C))
/obj/item/weapon/tank/emergency/phoron/double
name = "double emergency nitrogen tank"
icon_state = "emergency_double_nitrogen"
name = "double emergency phoron tank"
icon_state = "emergency_double_nitro"
gauge_icon = "indicator_emergency_double"
volume = 10
code/game/objects/random/random.dm
-2
View File
@@ -646,7 +646,6 @@ something, make sure it's not in one of the other lists.*/
prob(2);/obj/item/weapon/storage/box/sinpockets,
prob(1);/obj/item/weapon/storage/box/cups,
prob(3);/obj/item/weapon/storage/box/mousetraps,
prob(3);/obj/item/weapon/storage/box/engineer,
prob(3);/obj/item/weapon/storage/wallet,
prob(1);/obj/item/device/paicard,
prob(2);/obj/item/clothing/shoes/galoshes,
@@ -816,7 +815,6 @@ something, make sure it's not in one of the other lists.*/
prob(5);/obj/item/weapon/storage/backpack/messenger/engi,
prob(3);/obj/item/weapon/storage/backpack/dufflebag/eng,
prob(5);/obj/item/weapon/storage/box,
prob(3);/obj/item/weapon/storage/box/engineer,
prob(2);/obj/item/weapon/storage/belt/utility/full,
prob(3);/obj/item/weapon/storage/belt/utility,
prob(3);/obj/item/clothing/head/beret/engineering,
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)
code/game/objects/structures/loot_piles.dm
-1
View File
@@ -278,7 +278,6 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/weapon/storage/box/donut,
/obj/item/weapon/storage/box/donut/empty,
/obj/item/weapon/storage/box/evidence,
/obj/item/weapon/storage/box/engineer,
/obj/item/weapon/storage/box/lights/mixed,
/obj/item/weapon/storage/box/lights/tubes,
/obj/item/weapon/storage/box/lights/bulbs,
code/game/objects/structures/trash_pile.dm
-1
View File
@@ -169,7 +169,6 @@
prob(3);/obj/item/weapon/spacecash/c20,
prob(3);/obj/item/weapon/storage/backpack/dufflebag,
prob(3);/obj/item/weapon/storage/box/donkpockets,
prob(3);/obj/item/weapon/storage/box/engineer,
prob(3);/obj/item/weapon/storage/box/mousetraps,
prob(3);/obj/item/weapon/storage/wallet,
prob(2);/obj/item/clothing/glasses/meson/prescription,