cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-28 15:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master

Browse Source
This commit is contained in:
Enric Gabriel
2020-09-05 13:09:14 -03:00
parent ad8a55ebbe d6127d71a8
commit 20b25372e1
68 changed files with 1610 additions and 652 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/accents.dm
+7 -8
View File
@@ -78,23 +78,22 @@
speech_args[SPEECH_MESSAGE] = lowertext(message)
return speech_args
/datum/accent/bone
/datum/accent/span
var/span_flag
/datum/accent/bone/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] = span_flag
/datum/accent/span/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] |= span_flag
return speech_args
//bone tongues either have the sans accent or the papyrus accent
/datum/accent/bone/sans
/datum/accent/span/sans
span_flag = SPAN_SANS
/datum/accent/bone/papyrus
/datum/accent/span/papyrus
span_flag = SPAN_PAPYRUS
/datum/accent/robot/modify_speech(list/speech_args)
speech_args[SPEECH_SPANS] = SPAN_ROBOT
return speech_args
/datum/accent/span/robot
span_flag = SPAN_ROBOT
/datum/accent/dullahan/modify_speech(list/speech_args, datum/source, mob/living/carbon/owner)
if(owner)
code/datums/components/crafting/recipes/recipes_clothing.dm
+10
View File
@@ -273,6 +273,16 @@
time = 30
category = CAT_CLOTHING
/datum/crafting_recipe/twinsheath
name = "Twin Sword Sheath"
result = /obj/item/storage/belt/sabre/twin
reqs = list(/obj/item/stack/sheet/mineral/wood = 3,
/obj/item/stack/sheet/leather = 8)
tools = list(TOOL_WIRECUTTER)
time = 70
category = CAT_CLOTHING
/datum/crafting_recipe/durathread_reinforcement_kit
name = "Durathread Reinforcement Kit"
result = /obj/item/armorkit
code/datums/components/crafting/recipes/recipes_misc.dm
+77
View File
@@ -120,6 +120,53 @@
category = CAT_MISC
always_availible = FALSE // Disabled til learned
/datum/crafting_recipe/furnace
name = "Sandstone Furnace"
result = /obj/structure/furnace
time = 300
reqs = list(/obj/item/stack/sheet/mineral/sandstone = 15,
/obj/item/stack/sheet/metal = 4,
/obj/item/stack/rods = 2)
tools = list(TOOL_CROWBAR)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/tableanvil
name = "Table Anvil"
result = /obj/structure/anvil/obtainable/table
time = 300
reqs = list(/obj/item/stack/sheet/metal = 4,
/obj/item/stack/rods = 2)
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/sandvil
name = "Sandstone Anvil"
result = /obj/structure/anvil/obtainable/sandstone
time = 300
reqs = list(/obj/item/stack/sheet/mineral/sandstone = 24)
tools = list(TOOL_CROWBAR)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/basaltblock
name = "Sintered Basalt Block"
result = /obj/item/basaltblock
time = 200
reqs = list(/obj/item/stack/ore/glass/basalt = 50)
tools = list(TOOL_WELDER)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/basaltanvil
name = "Basalt Anvil"
result = /obj/structure/anvil/obtainable/basalt
time = 200
reqs = list(/obj/item/basaltblock = 5)
tools = list(TOOL_CROWBAR)
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
///////////////////
//Tools & Storage//
///////////////////
@@ -175,6 +222,17 @@
subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/toolboxhammer
name = "Toolbox Hammer"
result = /obj/item/melee/smith/hammer/toolbox
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
reqs = list(/obj/item/storage/toolbox = 1,
/obj/item/stack/sheet/metal = 4,
/obj/item/stack/rods = 2)
time = 40
subcategory = CAT_TOOL
category = CAT_MISC
/datum/crafting_recipe/papersack
name = "Paper Sack"
result = /obj/item/storage/box/papersack
@@ -358,6 +416,25 @@
//Unsorted//
////////////
/datum/crafting_recipe/stick
name = "Stick"
time = 30
reqs = list(/obj/item/stack/sheet/mineral/wood = 1)
result = /obj/item/stick
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/swordhilt
name = "Sword Hilt"
time = 30
reqs = list(/obj/item/stack/sheet/mineral/wood = 2)
result = /obj/item/swordhandle
subcategory = CAT_MISCELLANEOUS
category = CAT_MISC
/datum/crafting_recipe/blackcarpet
name = "Black Carpet"
reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1)
code/datums/materials/basemats.dm
+9 -5
View File
@@ -35,23 +35,24 @@ Unless you know what you're doing, only use the first three numbers. They're in
value_per_unit = 0.025
beauty_modifier = 0.075
///Slight force increase
///Slight force decrease. It's gold, it's soft as fuck.
/datum/material/gold
name = "gold"
desc = "Gold"
color = list(340/255, 240/255, 50/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0) //gold is shiny, but not as bright as bananium
strength_modifier = 1.2
strength_modifier = 0.8
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/gold
value_per_unit = 0.0625
beauty_modifier = 0.15
armor_modifiers = list("melee" = 1.1, "bullet" = 1.1, "laser" = 1.15, "energy" = 1.15, "bomb" = 1, "bio" = 1, "rad" = 1, "fire" = 0.7, "acid" = 1.1)
///Has no special properties
///Small force increase, for diamond swords
/datum/material/diamond
name = "diamond"
desc = "Highly pressurized carbon"
color = list(48/255, 272/255, 301/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
strength_modifier = 1.1
alpha = 132
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/diamond
@@ -106,6 +107,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "bluespace crystal"
desc = "Crystals with bluespace properties"
color = list(119/255, 217/255, 396/255,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, 0,0,0,0)
integrity_modifier = 0.2 //these things shatter when thrown.
alpha = 200
categories = list(MAT_CATEGORY_ORE = TRUE)
beauty_modifier = 0.5
@@ -139,7 +141,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "titanium"
desc = "Titanium"
color = "#b3c0c7"
strength_modifier = 1.3
strength_modifier = 1.1
categories = list(MAT_CATEGORY_ORE = TRUE, MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/titanium
value_per_unit = 0.0625
@@ -203,7 +205,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "adamantine"
desc = "A powerful material made out of magic, I mean science!"
color = "#6d7e8e"
strength_modifier = 1.5
strength_modifier = 1.3
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/mineral/adamantine
value_per_unit = 0.25
@@ -276,6 +278,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
desc = "Mir'ntrath barhah Nar'sie."
color = "#3C3434"
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
strength_modifier = 1.2
sheet_type = /obj/item/stack/sheet/runed_metal
value_per_unit = 0.75
armor_modifiers = list("melee" = 1.2, "bullet" = 1.2, "laser" = 1, "energy" = 1, "bomb" = 1.2, "bio" = 1.2, "rad" = 1.5, "fire" = 1.5, "acid" = 1.5)
@@ -286,6 +289,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
name = "bronze"
desc = "Clock Cult? Never heard of it."
color = "#92661A"
strength_modifier = 1.1
categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE)
sheet_type = /obj/item/stack/sheet/bronze
value_per_unit = 0.025
code/datums/skills/_skill_holder.dm
+1 -1
View File
@@ -110,7 +110,7 @@
/**
* Automatic skill increase, multiplied by skill affinity if existing.
* Only works if skill is numerical.
* Only works if skill is numerical or levelled..
*/
/datum/mind/proc/auto_gain_experience(skill, value, maximum, silent = FALSE)
if(!ispath(skill, /datum/skill))
code/datums/skills/blacksmithing.dm
+6
View File
@@ -0,0 +1,6 @@
/datum/skill/level/dorfy/blacksmithing
name = "Blacksmithing"
desc = "Making metal into fancy shapes using heat and force. Higher levels increase both your working speed at an anvil as well as the quality of your works."
name_color = COLOR_FLOORTILE_GRAY
skill_traits = list(SKILL_SANITY, SKILL_INTELLIGENCE, SKILL_USE_TOOL, SKILL_TRAINING_TOOL)
ui_category = SKILL_UI_CAT_MISC
code/datums/status_effects/debuffs.dm
+32
View File
@@ -533,6 +533,38 @@
if(100)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN,20)
/datum/status_effect/corrosion_curse/lesser
id = "corrosion_curse_lesser"
duration = 20 SECONDS
/datum/status_effect/corrosion_curse/lesser/tick()
. = ..()
if(!ishuman(owner))
return
var/mob/living/carbon/human/H = owner
var/chance = rand(0,100)
switch(chance)
if(0 to 19)
H.adjustBruteLoss(6)
if(20 to 29)
H.Dizzy(10)
if(30 to 39)
H.adjustOrganLoss(ORGAN_SLOT_LIVER,2)
if(40 to 49)
H.adjustOrganLoss(ORGAN_SLOT_HEART,2)
if(50 to 59)
H.adjustOrganLoss(ORGAN_SLOT_STOMACH,2)
if(60 to 69)
H.adjustOrganLoss(ORGAN_SLOT_EYES,5)
if(70 to 79)
H.adjustOrganLoss(ORGAN_SLOT_EARS,5)
if(80 to 89)
H.adjustOrganLoss(ORGAN_SLOT_LUNGS,5)
if(90 to 99)
H.adjustOrganLoss(ORGAN_SLOT_TONGUE,5)
if(100)
H.adjustOrganLoss(ORGAN_SLOT_BRAIN,10)
/datum/status_effect/amok
id = "amok"
status_type = STATUS_EFFECT_REPLACE