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

Merge branch 'master' into upstream-merge-12165

Browse Source
This commit is contained in:
Nadyr
2022-02-06 21:53:14 -05:00
committed by GitHub
parent e6f02c05a6 77f4e9fb63
commit 6e44bb7876
41 changed files with 51113 additions and 14304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/06_flavor.dm
+2 -1
View File
@@ -88,7 +88,8 @@
/datum/category_item/player_setup_item/general/flavor/proc/SetFlavorText(mob/user)
var/HTML = "<body>"
HTML += "<tt><center>"
HTML += "<b>Set Flavour Text</b> <hr />"
HTML += "<b>Set Flavor Text</b> <hr />"
HTML += "Note: This is not *literal* flavor of your character. This is visual description of what they look like. <hr />"
HTML += "<br></center>"
HTML += "<a href='?src=\ref[src];flavor_text=general'>General:</a> "
HTML += TextPreview(pref.flavor_texts["general"])
code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+6
View File
@@ -1216,3 +1216,9 @@
display_name = "Nehi's Radio"
ckeywhitelist = list("zodiacshadow")
character_name = list("Nehi Maximus")
/datum/gear/fluff/lucky_amour
path = /obj/item/device/modkit_conversion/crusader_luck
display_name = "Lucky's amour"
ckeywhitelist = list ("thedavestdave")
character_name = list("Lucky")
code/modules/client/stored_item.dm
+1 -2
View File
@@ -227,5 +227,4 @@
/obj/item/weapon/gun/energy/sizegun/abductor
persist_storable = FALSE
/obj/item/stack
persist_storable = FALSE
persist_storable = FALSE
code/modules/clothing/under/miscellaneous_vr.dm
+11
View File
@@ -238,3 +238,14 @@
icon_state = "summerdress3"
/obj/item/clothing/under/summerdress/blue
icon_state = "summerdress2"
/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear
name = "site manager's feminine formalwear"
desc = "Essentially a skimpy...dress? Leotard? Whatever it is, it has the coloration and markings suitable for a site manager or rough equivalent."
icon = 'icons/inventory/uniform/item_vr.dmi'
default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi'
icon_state = "lewdcap"
item_state = "lewdcap"
rolled_sleeves = -1
rolled_down = -1
body_parts_covered = UPPER_TORSO // frankly this thing's a fucking embarassment
code/modules/mining/drilling/drill.dm
+1 -1
View File
@@ -295,7 +295,7 @@
if(supports.len >= braces_needed)
supported = 1
else for(var/obj/machinery/mining/brace/check in supports)
if(check.brace_tier > 3)
if(check.brace_tier >= 3)
supported = 1
for(var/obj/machinery/mining/brace/check in supports)
total_brace_tier += check.brace_tier
code/modules/mining/ore_redemption_machine/equipment_vendor.dm
+1
View File
@@ -123,6 +123,7 @@
EQUIPMENT("Plush Toy", /obj/random/plushie, 300),
EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200),
EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000),
EQUIPMENT("Thalers - 1000", /obj/item/weapon/spacecash/c1000, 10000),
EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200),
EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125),
)
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+9 -2
View File
@@ -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
code/modules/paperwork/paper.dm
+1
View File
@@ -341,6 +341,7 @@
t = replacetext(t, "\[/u\]", "</U>")
t = replacetext(t, "\[time\]", "[stationtime2text()]")
t = replacetext(t, "\[date\]", "[stationdate2text()]")
t = replacetext(t, "\[station\]", "[station_name()]")
t = replacetext(t, "\[large\]", "<font size=\"4\">")
t = replacetext(t, "\[/large\]", "</font>")
if(findtext(t, "\[sign\]"))
code/modules/research/mechfab_designs.dm
+22 -4
View File
@@ -577,21 +577,23 @@
build_path = /obj/item/mecha_parts/mecha_equipment/repair_droid
/* These are way too OP to be buildable
*/ //CHOMPEdit upstream whines too much.
/datum/design/item/mecha/combat_shield
name = "linear combat shield"
desc = "Linear shield projector. Deploys a large, familiar, and rectangular shield in one direction at a time."
id = "mech_shield_droid"
req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4)
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750)
req_tech = list(TECH_PHORON = 5, TECH_MAGNET = 7, TECH_ILLEGAL = 5) //Chompedit bumped up a little
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_VERDANTIUM = 2000, MAT_GLASS = 3750) //Chompedit Also bumped up a little
build_path = /obj/item/mecha_parts/mecha_equipment/combat_shield
/datum/design/item/mecha/omni_shield
name = "Omni Shield"
desc = "Integral shield projector. Can only protect the exosuit, but has no weak angles."
id = "mech_shield_omni"
req_tech = list(TECH_PHORON = 3, TECH_MAGNET = 6, TECH_ILLEGAL = 4)
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_GLASS = 3750)
req_tech = list(TECH_PHORON = 5, TECH_MAGNET = 7, TECH_ILLEGAL = 5) //Chompedit bumped up a little
materials = list(MAT_STEEL = 8000, MAT_GOLD = 2000, MAT_SILVER = 3000, MAT_PHORON = 5000, MAT_VERDANTIUM = 2000, MAT_GLASS = 3750) //Chompedit Also bumped up a little
build_path = /obj/item/mecha_parts/mecha_equipment/omni_shield
/* //CHOMPEdit closing comment.
*/
/datum/design/item/mecha/crisis_drone
@@ -768,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"
code/modules/research/mechfab_designs_ch.dm
+53 -1
View File
@@ -56,4 +56,56 @@
id = "scarab_right_legs"
build_path = /obj/item/mecha_parts/part/scarab_right_legs
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 30000)
materials = list(DEFAULT_WALL_MATERIAL = 30000)
/datum/design/item/mechfab/phazon
category = list("Phazon")
req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1)
/datum/design/item/mechfab/phazon/chassis
name = "Phazon Chassis"
id = "phazon_chassis"
build_path = /obj/item/mecha_parts/chassis/phazon
time = 10
materials = list(DEFAULT_WALL_MATERIAL = 30000, MAT_DURASTEEL = 4000, MAT_PHORON = 4000, MAT_GOLD = 5000, MAT_VERDANTIUM = 4000)
/datum/design/item/mechfab/phazon/torso
name = "Phazon Torso"
id = "phazon_torso"
build_path = /obj/item/mecha_parts/part/phazon_torso
time = 30
materials = list(DEFAULT_WALL_MATERIAL = 30000, MAT_DURASTEEL = 2000, MAT_PHORON = 6000, MAT_GOLD = 6000, MAT_VERDANTIUM = 2000)
/datum/design/item/mechfab/phazon/head
name = "Phazon Head"
id = "phazon_head"
build_path = /obj/item/mecha_parts/part/phazon_head
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 10000, MAT_DURASTEEL = 1000, MAT_PHORON = 4000, MAT_GOLD = 4000, MAT_VERDANTIUM = 500)
/datum/design/item/mechfab/phazon/left_arm
name = "Phazon Left Arm"
id = "phazon_left_arm"
build_path = /obj/item/mecha_parts/part/phazon_left_arm
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000, MAT_PHORON = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 500)
/datum/design/item/mechfab/phazon/right_arm
name = "Phazon Right Arm"
id = "phazon_right_arm"
build_path = /obj/item/mecha_parts/part/phazon_right_arm
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000, MAT_PHORON = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 500)
/datum/design/item/mechfab/phazon/left_leg
name = "Phazon Left Legs"
id = "phazon_left_legs"
build_path = /obj/item/mecha_parts/part/phazon_left_leg
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000, MAT_PHORON = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 500)
/datum/design/item/mechfab/phazon/right_leg
name = "Phazon Right Legs"
id = "phazon_right_legs"
build_path = /obj/item/mecha_parts/part/phazon_right_leg
time = 20
materials = list(DEFAULT_WALL_MATERIAL = 15000, MAT_PHORON = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 500)
code/modules/vore/fluffstuff/custom_items_vr.dm
+21 -1
View File
@@ -1416,4 +1416,24 @@ End CHOMP Removal*/
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "stamp-midhorror"
stamptext = "This paper has been certified by The Council of Mid Horror"
//thedavestdave Lucky
///I know this is pretty bodgey but if it stupid and it works it isn't stupid
/obj/item/clothing/suit/storage/hooded/explorer/lucky
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "luck"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "luck"
name = "Lucky's armor"
desc = "A chain mail suit with a badly drawn one eared cat on the front."
/obj/item/device/modkit_conversion/crusader_luck
skip_content_check = TRUE
name = "Lucky's armor"
desc = "A chain mail suit with a badly drawn one eared cat on the front."
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "modkit"
from_suit = /obj/item/clothing/suit/storage/hooded/explorer
to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky