shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SandPoot
2022-04-09 00:03:13 -03:00
parent 586a035132 3d91de2f10
commit 695835fcd6
428 changed files with 8031 additions and 7608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
+8
View File
@@ -158,3 +158,11 @@
materials = list(/datum/material/iron = 150, /datum/material/glass = 150)
build_path = /obj/item/geiger_counter
category = list("initial", "Tools")
/datum/design/chisel
name = "Chisel"
id = "chisel"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 75)
build_path = /obj/item/chisel
category = list("initial","Tools")
code/modules/research/designs/mechfabricator_designs.dm
-9
View File
@@ -585,15 +585,6 @@
construction_time = 100
category = list("Exosuit Equipment")
/datum/design/mech_cable_layer
name = "Exosuit Engineering Equipment (Cable Layer)"
id = "mech_cable_layer"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/cable_layer
materials = list(/datum/material/iron=10000)
construction_time = 100
category = list("Exosuit Equipment")
/datum/design/mech_generator
name = "Exosuit Equipment (Plasma Generator)"
id = "mech_generator"
code/modules/research/techweb/nodes/mecha_nodes.dm
+1 -1
View File
@@ -14,7 +14,7 @@
starting_node = TRUE
display_name = "Basic Exosuit Equipment"
description = "Various tools fit for basic mech units"
design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher", "mech_cable_layer")
design_ids = list("mech_drill", "mech_mscanner", "mech_extinguisher")
/datum/techweb_node/adv_mecha
id = "adv_mecha"
code/modules/research/xenobiology/crossbreeding/_clothing.dm
+1 -1
View File
@@ -135,7 +135,7 @@ Slimecrossing Armor
obj_flags = IMMUTABLE_SLOW
slowdown = 4
var/hit_reflect_chance = 10 // Citadel Change: because 40% chance of bouncing lasers back into peoples faces isn't good.
armor = list("melee" = 70, "bullet" = 70, "laser" = 40, "energy" = 40, "bomb" = 80, "bio" = 80, "rad" = 80, "fire" = 70, "acid" = 90) //Citadel Change to avoid immortal Xenobiologists.
armor = list(MELEE = 70, BULLET = 70, LASER = 40, ENERGY = 40, BOMB = 80, BIO = 80, RAD = 80, FIRE = 70, ACID = 90) //Citadel Change to avoid immortal Xenobiologists.
/obj/item/clothing/suit/armor/heavy/adamantine/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(is_energy_reflectable_projectile(object) && prob(hit_reflect_chance))
code/modules/research/xenobiology/crossbreeding/_misc.dm
+1 -1
View File
@@ -71,7 +71,7 @@
icon_state = "frozen"
density = TRUE
max_integrity = 100
armor = list("melee" = 30, "bullet" = 50, "laser" = -50, "energy" = -50, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = -80, "acid" = 30)
armor = list(MELEE = 30, BULLET = 50, LASER = -50, ENERGY = -50, BOMB = 0, BIO = 100, RAD = 100, FIRE = -80, ACID = 30)
/obj/structure/ice_stasis/Initialize(mapload)
. = ..()
code/modules/research/xenobiology/crossbreeding/burning.dm
+1 -1
View File
@@ -447,7 +447,7 @@ Burning extracts:
icon_state = "adamshield"
item_state = "adamshield"
w_class = WEIGHT_CLASS_HUGE
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 80, ACID = 70)
slot_flags = ITEM_SLOT_BACK
block_chance = 75
force = 0