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

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-20

Browse Source
This commit is contained in:
Leshana
2018-01-21 00:23:00 -05:00
parent 7b55206351 c79a75abce
commit 805897eafb
15 changed files with 283 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/miscellaneous.dm
+22 -22
View File
@@ -665,10 +665,10 @@ obj/item/clothing/suit/storage/toggle/peacoat
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
hooded = 1
hoodtype = /obj/item/clothing/head/winterhood
hoodtype = /obj/item/clothing/head/hood/winter
allowed = list (/obj/item/weapon/pen, /obj/item/weapon/paper, /obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/storage/box/matches, /obj/item/weapon/reagent_containers/food/drinks/flask)
/obj/item/clothing/head/winterhood
/obj/item/clothing/head/hood/winter
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
icon_state = "generic_hood"
@@ -682,9 +682,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatcaptain"
item_state_slots = list(slot_r_hand_str = "coatcaptain", slot_l_hand_str = "coatcaptain")
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/winterhood/captain
hoodtype = /obj/item/clothing/head/hood/winter/captain
/obj/item/clothing/head/winterhood/captain
/obj/item/clothing/head/hood/winter/captain
name = "colony director's winter hood"
armor = list(melee = 20, bullet = 15, laser = 20, energy = 10, bomb = 15, bio = 0, rad = 0)
@@ -693,9 +693,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatsecurity"
item_state_slots = list(slot_r_hand_str = "coatsecurity", slot_l_hand_str = "coatsecurity")
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/winterhood/security
hoodtype = /obj/item/clothing/head/hood/winter/security
/obj/item/clothing/head/winterhood/security
/obj/item/clothing/head/hood/winter/security
name = "security winter hood"
armor = list(melee = 25, bullet = 20, laser = 20, energy = 15, bomb = 20, bio = 0, rad = 0)
@@ -704,9 +704,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatmedical"
item_state_slots = list(slot_r_hand_str = "coatmedical", slot_l_hand_str = "coatmedical")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
hoodtype = /obj/item/clothing/head/winterhood/medical
hoodtype = /obj/item/clothing/head/hood/winter/medical
/obj/item/clothing/head/winterhood/medical
/obj/item/clothing/head/hood/winter/medical
name = "medical winter hood"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0)
@@ -715,9 +715,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatscience"
item_state_slots = list(slot_r_hand_str = "coatscience", slot_l_hand_str = "coatscience")
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/winterhood/science
hoodtype = /obj/item/clothing/head/hood/winter/science
/obj/item/clothing/head/winterhood/science
/obj/item/clothing/head/hood/winter/science
name = "science winter hood"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 0, rad = 0)
@@ -726,9 +726,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatengineer"
item_state_slots = list(slot_r_hand_str = "coatengineer", slot_l_hand_str = "coatengineer")
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
hoodtype = /obj/item/clothing/head/winterhood/engineering
hoodtype = /obj/item/clothing/head/hood/winter/engineering
/obj/item/clothing/head/winterhood/engineering
/obj/item/clothing/head/hood/winter/engineering
name = "engineering winter hood"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20)
@@ -736,27 +736,27 @@ obj/item/clothing/suit/storage/toggle/peacoat
name = "atmospherics winter coat"
icon_state = "coatatmos"
item_state_slots = list(slot_r_hand_str = "coatatmos", slot_l_hand_str = "coatatmos")
hoodtype = /obj/item/clothing/head/winterhood/engineering/atmos
hoodtype = /obj/item/clothing/head/hood/winter/engineering/atmos
/obj/item/clothing/head/winterhood/engineering/atmos
/obj/item/clothing/head/hood/winter/engineering/atmos
name = "atmospherics winter hood"
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro
name = "hydroponics winter coat"
icon_state = "coathydro"
item_state_slots = list(slot_r_hand_str = "coathydro", slot_l_hand_str = "coathydro")
hoodtype = /obj/item/clothing/head/winterhood/hydro
hoodtype = /obj/item/clothing/head/hood/winter/hydro
/obj/item/clothing/head/winterhood/hydro
/obj/item/clothing/head/hood/winter/hydro
name = "hydroponics winter hood"
/obj/item/clothing/suit/storage/hooded/wintercoat/cargo
name = "cargo winter coat"
icon_state = "coatcargo"
item_state_slots = list(slot_r_hand_str = "coatcargo", slot_l_hand_str = "coatcargo")
hoodtype = /obj/item/clothing/head/winterhood/cargo
hoodtype = /obj/item/clothing/head/hood/winter/cargo
/obj/item/clothing/head/winterhood/cargo
/obj/item/clothing/head/hood/winter/cargo
name = "cargo winter hood"
/obj/item/clothing/suit/storage/hooded/wintercoat/miner
@@ -764,9 +764,9 @@ obj/item/clothing/suit/storage/toggle/peacoat
icon_state = "coatminer"
item_state_slots = list(slot_r_hand_str = "coatminer", slot_l_hand_str = "coatminer")
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
hoodtype = /obj/item/clothing/head/winterhood/miner
hoodtype = /obj/item/clothing/head/hood/winter/miner
/obj/item/clothing/head/winterhood/miner
/obj/item/clothing/head/hood/winter/miner
name = "mining winter hood"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
@@ -780,7 +780,7 @@ obj/item/clothing/suit/storage/toggle/peacoat
min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hooded = TRUE
hoodtype = /obj/item/clothing/head/explorer
hoodtype = /obj/item/clothing/head/hood/explorer
siemens_coefficient = 0.9
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 50) // Inferior to sec vests in bullet/laser but better for environmental protection.
allowed = list(
@@ -794,7 +794,7 @@ obj/item/clothing/suit/storage/toggle/peacoat
/obj/item/weapon/pickaxe
)
/obj/item/clothing/head/explorer
/obj/item/clothing/head/hood/explorer
name = "explorer hood"
desc = "An armoured hood for exploring harsh environments."
icon_state = "explorer"
code/modules/clothing/suits/toggles.dm
+7 -5
View File
@@ -5,9 +5,11 @@
var/hoodtype = null //so the chaplain hoodie or other hoodies can override this
var/suittoggled = 0
var/hooded = 0
var/toggleicon
action_button_name = "Toggle Hood"
/obj/item/clothing/suit/storage/hooded/New()
toggleicon = "[initial(icon_state)]"
MakeHood()
..()
@@ -17,7 +19,7 @@
/obj/item/clothing/suit/storage/hooded/proc/MakeHood()
if(!hood)
var/obj/item/clothing/head/winterhood/W = new hoodtype(src)
var/obj/item/clothing/head/hood/winter/W = new hoodtype(src)
hood = W
/obj/item/clothing/suit/storage/hooded/ui_action_click()
@@ -29,7 +31,7 @@
..()
/obj/item/clothing/suit/storage/hooded/proc/RemoveHood()
icon_state = "[initial(icon_state)]"
icon_state = toggleicon
suittoggled = 0
hood.canremove = TRUE // This shouldn't matter anyways but just incase.
if(ishuman(hood.loc))
@@ -46,16 +48,16 @@
if(ishuman(loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
H << "<span class='warning'>You must be wearing [src] to put up the hood!</span>"
to_chat(H, "<span class='warning'>You must be wearing [src] to put up the hood!</span>")
return
if(H.head)
H << "<span class='warning'>You're already wearing something on your head!</span>"
to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
suittoggled = 1
hood.canremove = FALSE
icon_state = "[initial(icon_state)]_t"
icon_state = "[toggleicon]_t"
H.update_inv_wear_suit()
else
RemoveHood()
code/modules/customitems/item_spawning.dm
+7 -16
View File
@@ -9,11 +9,13 @@
// On-mob icons must be in CUSTOM_ITEM_MOB with state name [item_icon].
// Inhands must be in CUSTOM_ITEM_MOB as [icon_state]_l and [icon_state]_r.
// Kits must have mech icons in CUSTOM_ITEM_OBJ under [kit_icon].
// Mech kits must have mech icons in CUSTOM_ITEM_OBJ under [kit_icon].
// Broken must be [kit_icon]-broken and open must be [kit_icon]-open.
// Kits must also have hardsuit icons in CUSTOM_ITEM_MOB as [kit_icon]_suit
// and [kit_icon]_helmet, and in CUSTOM_ITEM_OBJ as [kit_icon].
// Voidsuits and hooded kits must also have hardsuit icons in CUSTOM_ITEM_MOB as [kit_icon]_suit
// and [kit_icon]_helmet, and in CUSTOM_ITEM_OBJ as [kit_icon]_suit.
// If hooded, have [kit_icon]_suit_t in both files for the hood-up version.
// If not using the default overlay, have [kit_icon]_light in both files for custom light overlays.
/var/list/custom_items = list()
@@ -30,7 +32,7 @@
var/kit_name
var/kit_desc
var/kit_icon
var/additional_data
var/additional_data //for modular modkits, item path; for mech modkits, allowed mechs; for voidsuit modkits, light overlays
/datum/custom_item/proc/spawn_item(var/newloc)
var/obj/item/citem = new item_path(newloc)
@@ -69,18 +71,7 @@
// Kits are dumb so this is going to have to be hardcoded/snowflake.
if(istype(item, /obj/item/device/kit))
var/obj/item/device/kit/K = item
K.new_name = kit_name
K.new_desc = kit_desc
K.new_icon = kit_icon
K.new_icon_file = CUSTOM_ITEM_OBJ
if(istype(item, /obj/item/device/kit/paint))
var/obj/item/device/kit/paint/kit = item
kit.allowed_types = splittext(additional_data, ", ")
else if(istype(item, /obj/item/device/kit/suit))
var/obj/item/device/kit/suit/kit = item
kit.new_light_overlay = additional_data
kit.new_mob_icon_file = CUSTOM_ITEM_MOB
K.set_info(kit_name, kit_desc, kit_icon, additional_data = additional_data)
return item
/datum/custom_item/proc/apply_inherit_inhands(var/obj/item/item)
code/modules/organs/blood.dm
+1 -1
View File
@@ -141,7 +141,7 @@ var/const/CE_STABLE_THRESHOLD = 0.5
//Bleeding out
var/blood_max = 0
var/blood_loss_divisor = 30 //lower factor = more blood loss
var/blood_loss_divisor = 30.01 //lower factor = more blood loss
// Some species bleed out differently
blood_loss_divisor /= species.bloodloss_rate
code/modules/reagents/Chemistry-Reagents.dm
+2 -1
View File
@@ -44,7 +44,8 @@
var/list/glass_special = null // null equivalent to list()
/datum/reagent/proc/remove_self(var/amount) // Shortcut
holder.remove_reagent(id, amount)
if(holder)
holder.remove_reagent(id, amount)
// This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing.
/datum/reagent/proc/touch_mob(var/mob/M, var/amount)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+4 -4
View File
@@ -2489,13 +2489,13 @@
/datum/reagent/ethanol/euphoria
name = "Euphoria"
id = "euphoria"
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
description = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
taste_description = "impossibly rich alcohol"
color = "#614126"
strength = 9
glass_name = "Euphoria"
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existance."
glass_desc = "Invented by a Eutopian marketing team, this is one of the most expensive cocktails in existence."
/datum/reagent/ethanol/xanaducannon
name = "Xanadu Cannon"
@@ -2583,7 +2583,7 @@
/datum/reagent/ethanol/winebrandy
name = "Wine Brandy"
id = "winebrandy"
description = "An premium spirit made from distilled wine."
description = "A premium spirit made from distilled wine."
taste_description = "very sweet dried fruit with many elegant notes"
color = "#4C130B" // rgb(76,19,11)
strength = 20
@@ -2735,7 +2735,7 @@
color = "#a0692e" // rgb(160, 105, 46)
strength = 20
glass_name = "Whisker Sour"
glass_name = "Whiskey Sour"
glass_desc = "A smokey, refreshing lemoned whiskey."
/datum/reagent/ethanol/oldfashioned
code/modules/reagents/Chemistry-Recipes.dm
+1 -1
View File
@@ -1868,7 +1868,7 @@
required_reagents = list("tea" = 5, "limejuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/limetea
/datum/chemical_reaction/drinks/orangetea
name = "Orange Tea"
id = "orangetea"
result = "orangetea"