mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-19 20:23:07 +01:00
Merge branch 'master' into upstream-merge-12168
This commit is contained in:
Nadyr
@@ -58,11 +58,11 @@
|
||||
|
||||
/datum/gear/accessory/brown_vest
|
||||
display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)"
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
|
||||
|
||||
/datum/gear/accessory/black_vest
|
||||
display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)"
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
|
||||
|
||||
/datum/gear/accessory/white_vest
|
||||
display_name = "webbing, white (Medical)"
|
||||
@@ -70,11 +70,11 @@
|
||||
|
||||
/datum/gear/accessory/brown_drop_pouches
|
||||
display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)"
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
|
||||
|
||||
/datum/gear/accessory/black_drop_pouches
|
||||
display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)"
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner", "Blueshield Guard","Security Pilot") //YW ADDITIONS
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Blueshield Guard","Security Pilot", "Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") //YW ADDITIONS
|
||||
|
||||
/datum/gear/accessory/white_drop_pouches
|
||||
display_name = "drop pouches, white (Medical)"
|
||||
@@ -83,7 +83,6 @@
|
||||
/datum/gear/accessory/bluespace
|
||||
display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)"
|
||||
path = /obj/item/clothing/accessory/storage/bluespace
|
||||
allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner")
|
||||
cost = 2
|
||||
|
||||
/datum/gear/accessory/webbing
|
||||
|
||||
@@ -134,6 +134,15 @@
|
||||
to_chat(user, "<span class='warning'>You cannot store \the [O]. You already have something stored.</span>")
|
||||
busy_bank = FALSE
|
||||
return
|
||||
var/choice = tgui_alert(user, "If you store \the [O], anything it contains may be lost to \the [src]. Are you sure?", "[src]", list("Store", "Cancel"), timeout = 10 SECONDS)
|
||||
if(!choice || choice == "Cancel" || !Adjacent(user) || inoperable() || panel_open)
|
||||
busy_bank = FALSE
|
||||
return
|
||||
for(var/obj/check in O.contents)
|
||||
if(!check.persist_storable)
|
||||
to_chat(user, "<span class='warning'>\The [src] buzzes. \The [O] contains [check], which cannot be stored. Please remove this item before attempting to store \the [O]. As a reminder, any contents of \the [O] will be lost if you store it with contents.</span>")
|
||||
busy_bank = FALSE
|
||||
return
|
||||
user.visible_message("<span class='notice'>\The [user] begins storing \the [O] in \the [src].</span>","<span class='notice'>You begin storing \the [O] in \the [src].</span>")
|
||||
icon_state = "item_bank_o"
|
||||
if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable())
|
||||
@@ -216,9 +225,6 @@
|
||||
/obj/item/weapon/gun/energy/sizegun/admin
|
||||
persist_storable = FALSE
|
||||
/obj/item/weapon/gun/energy/sizegun/abductor
|
||||
<<<<<<< HEAD
|
||||
persist_storable = FALSE
|
||||
=======
|
||||
persist_storable = FALSE
|
||||
/obj/item/stack
|
||||
persist_storable = FALSE
|
||||
@@ -239,5 +245,4 @@
|
||||
/obj/item/seeds
|
||||
persist_storable = FALSE
|
||||
/obj/item/weapon/reagent_containers/food/snacks/grown
|
||||
persist_storable = FALSE
|
||||
>>>>>>> 413c0b13d21... Merge pull request #12168 from Very-Soft/anodawun
|
||||
persist_storable = FALSE
|
||||
@@ -260,6 +260,32 @@
|
||||
/obj/item/weapon/cell
|
||||
)
|
||||
|
||||
//Miner's Crewsuit (BROWN)
|
||||
//Basically just the basic suit, but with brown markings. If anyone wants to tweak this, go wild.
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/mining
|
||||
name = "vintage miner's's voidsuit helmet"
|
||||
desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one has brown markings, denoting it as a miner's helmet."
|
||||
icon_state = "rig0-vintageminer"
|
||||
item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black")
|
||||
armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50)
|
||||
light_overlay = "helmet_light"
|
||||
|
||||
/obj/item/clothing/suit/space/void/refurb/mining
|
||||
name = "vintage miner's voidsuit"
|
||||
desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one has brown markings, denoting it as a miner's suit."
|
||||
icon_state = "rig-vintageminer"
|
||||
item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG")
|
||||
armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50)
|
||||
allowed = list(/obj/item/device/flashlight,
|
||||
/obj/item/weapon/tank,
|
||||
/obj/item/device/suit_cooling_unit,
|
||||
/obj/item/weapon/storage/briefcase/inflatable,
|
||||
/obj/item/device/gps,
|
||||
/obj/item/device/radio/beacon,
|
||||
/obj/item/weapon/pickaxe,
|
||||
/obj/item/weapon/shovel
|
||||
)
|
||||
|
||||
//Mercenary Crewsuit (RED, CROSS)
|
||||
//The best of the best, this should be ultra-rare
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/mercenary
|
||||
|
||||
@@ -55,6 +55,15 @@
|
||||
/obj/item/clothing/suit/space/void/refurb/pilot/talon
|
||||
name = "talon pilot voidsuit"
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/mining/talon
|
||||
name = "talon miner voidsuit helmet"
|
||||
desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. \"ITV TALON\" has been stamped onto the sides of the helmet."
|
||||
camera_networks = list(NETWORK_TALON_HELMETS)
|
||||
|
||||
/obj/item/clothing/suit/space/void/refurb/mining/talon
|
||||
name = "talon miner voidsuit"
|
||||
desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. \"ITV TALON\" is stamped across the left side of the breastplate in faded faux-gold."
|
||||
|
||||
/obj/item/clothing/head/helmet/space/void/refurb/research/talon
|
||||
name = "talon scientific voidsuit helmet"
|
||||
camera_networks = list(NETWORK_TALON_HELMETS)
|
||||
|
||||
@@ -243,7 +243,10 @@
|
||||
return
|
||||
|
||||
remove_points(inserted_id, prize.cost)
|
||||
new prize.equipment_path(loc)
|
||||
//VOREStation Edit Start
|
||||
var/obj/I = new prize.equipment_path(loc)
|
||||
I.persist_storable = FALSE
|
||||
//VOREStation Edit End
|
||||
flick(icon_vend, src) //VOREStation Add
|
||||
else
|
||||
flick(icon_deny, src) //VOREStation Add
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes.
|
||||
var/allergens = null // Things that will make this species very sick
|
||||
var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_WEAKEN // What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses.
|
||||
var/allergen_damage_severity = 1.2 // How bad are reactions to the allergen? Touch with extreme caution.
|
||||
var/allergen_damage_severity = 3.6 // How bad are reactions to the allergen? Touch with extreme caution.
|
||||
var/allergen_disable_severity = 3 // Whilst this determines how long nonlethal effects last and how common emotes are.
|
||||
|
||||
var/min_age = 17
|
||||
|
||||
@@ -270,10 +270,17 @@
|
||||
|
||||
/datum/trait/neutral/allergen_reduced_effect
|
||||
name = "Reduced Allergen Reaction"
|
||||
desc = "This trait halves the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
|
||||
desc = "This trait drastically reduces the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("allergen_damage_severity" = 0.6)
|
||||
var_changes = list("allergen_damage_severity" = 1.2)
|
||||
|
||||
/datum/trait/neutral/allergen_increased_effect
|
||||
name = "Increased Allergen Reaction"
|
||||
desc = "This trait drastically increases the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)."
|
||||
cost = 0
|
||||
custom_only = FALSE
|
||||
var_changes = list("allergen_damage_severity" = 7.2)
|
||||
|
||||
// Spicy Food Traits, from negative to positive.
|
||||
/datum/trait/neutral/spice_intolerance_extreme
|
||||
|
||||
@@ -770,6 +770,22 @@
|
||||
materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000)
|
||||
build_path = /obj/item/mecha_parts/mecha_equipment/speedboost
|
||||
|
||||
/datum/design/item/mecha/auxstorage
|
||||
name = "Auxillary Exosuit Storage Bay"
|
||||
desc = "An auxillary storage compartment, for attaching to exosuits."
|
||||
id = "mech_storage"
|
||||
req_tech = list(TECH_MATERIAL = 4)
|
||||
materials = list(MAT_STEEL = 10000)
|
||||
build_path = /obj/item/mecha_parts/mecha_equipment/storage
|
||||
|
||||
/datum/design/item/mecha/bsauxstorage
|
||||
name = "Auxillary Exosuit Storage Wormhole"
|
||||
desc = "An auxillary storage wormhole, for attaching to exosuits."
|
||||
id = "mech_storage_bs"
|
||||
req_tech = list(TECH_MATERIAL = 4)
|
||||
materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000)
|
||||
build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace
|
||||
|
||||
/datum/design/item/synthetic_flash
|
||||
name = "Synthetic Flash"
|
||||
id = "sflash"
|
||||
|
||||
Reference in New Issue
Block a user