cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 13:38:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#3697)

Browse Source 
* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes (#56889)

* crystallizer

* [Ready]Atmos enhanced. Part 1: Crystallizer and machine recipes

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-27 18:55:16 +00:00
committed by GitHub
co-authored by Ghilker
parent 06cc371de1
commit 640cc9744c
23 changed files with 702 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/circuitboards/machine_circuitboards.dm
+9
View File
@@ -338,6 +338,15 @@
/obj/item/stack/sheet/glass = 10,
/obj/item/stack/sheet/plasteel = 5)
/obj/item/circuitboard/machine/crystallizer
name = "Crystallizer (Machine Board)"
icon_state = "engineering"
build_path = /obj/machinery/atmospherics/components/binary/crystallizer
req_components = list(
/obj/item/stack/cable_coil = 10,
/obj/item/stack/sheet/glass = 10,
/obj/item/stack/sheet/plasteel = 5)
//Generic
/obj/item/circuitboard/machine/circuit_imprinter
code/game/objects/items/fireaxe.dm
+11
View File
@@ -88,3 +88,14 @@
/obj/item/fireaxe/metal_h2_axe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=23, icon_wielded="[base_icon_state]1")
/obj/item/fireaxe/elder_atmosian_fireaxe
icon_state = "elder_axe0"
base_icon_state = "elder_axe"
name = "eldest fireaxe"
desc = "Upgrade of the metallic hydrogen axe; created by some madman with mysterious powers"
/obj/item/fireaxe/elder_atmosian_fireaxe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=7, force_wielded=25, icon_wielded="[base_icon_state]1")
AddComponent(/datum/component/lifesteal, 5)
code/game/objects/items/grenades/atmos_grenades.dm
+39 -35
View File
@@ -6,38 +6,6 @@
inhand_icon_state = "flashbang"
resistance_flags = FIRE_PROOF
/obj/item/grenade/gas_crystal/healium_crystal
name = "Healium crystal"
desc = "A crystal made from the Healium gas, it's cold to the touch."
icon_state = "healium_crystal"
///Amount of stamina damage mobs will take if in range
var/stamina_damage = 30
///Range of the grenade that will cool down and affect mobs
var/freeze_range = 4
///Amount of gas released if the state is optimal
var/gas_amount = 250
/obj/item/grenade/gas_crystal/proto_nitrate_crystal
name = "Proto Nitrate crystal"
desc = "A crystal made from the Proto Nitrate gas, you can see the liquid gases inside."
icon_state = "proto_nitrate_crystal"
///Range of the grenade air refilling
var/refill_range = 5
///Amount of Nitrogen gas released (close to the grenade)
var/n2_gas_amount = 400
///Amount of Oxygen gas released (close to the grenade)
var/o2_gas_amount = 100
/obj/item/grenade/gas_crystal/zauker_crystal
name = "Zauker crystal"
desc = "A crystal made from the Zauker Gas, you can see the liquid plasma inside."
icon_state = "zauker_crystal"
ex_dev = 1
ex_heavy = 2
ex_light = 4
ex_flame = 2
/obj/item/grenade/gas_crystal/arm_grenade(mob/user, delayoverride, msg = TRUE, volume = 60)
var/turf/turf_loc = get_turf(src)
log_grenade(user, turf_loc) //Inbuilt admin procs already handle null users
@@ -54,6 +22,17 @@
SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride)
addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride)
/obj/item/grenade/gas_crystal/healium_crystal
name = "Healium crystal"
desc = "A crystal made from the Healium gas, it's cold to the touch."
icon_state = "healium_crystal"
///Amount of stamina damage mobs will take if in range
var/stamina_damage = 30
///Range of the grenade that will cool down and affect mobs
var/freeze_range = 4
///Amount of gas released if the state is optimal
var/gas_amount = 70
/obj/item/grenade/gas_crystal/healium_crystal/detonate(mob/living/lanced_by)
. = ..()
update_mob()
@@ -70,12 +49,22 @@
floor_loc.MakeSlippery(TURF_WET_PERMAFROST, (5 / distance_from_center) MINUTES)
if(floor_loc.air.gases[/datum/gas/plasma])
floor_loc.air.gases[/datum/gas/plasma][MOLES] -= floor_loc.air.gases[/datum/gas/plasma][MOLES] * 0.5 / distance_from_center
floor_loc.air_update_turf(FALSE, FALSE)
for(var/mob/living/carbon/live_mob in turf_loc)
live_mob.adjustStaminaLoss(stamina_damage / distance_from_center)
live_mob.adjust_bodytemperature(-150 / distance_from_center)
qdel(src)
/obj/item/grenade/gas_crystal/proto_nitrate_crystal
name = "Proto Nitrate crystal"
desc = "A crystal made from the Proto Nitrate gas, you can see the liquid gases inside."
icon_state = "proto_nitrate_crystal"
///Range of the grenade air refilling
var/refill_range = 5
///Amount of Nitrogen gas released (close to the grenade)
var/n2_gas_amount = 60
///Amount of Oxygen gas released (close to the grenade)
var/o2_gas_amount = 30
/obj/item/grenade/gas_crystal/proto_nitrate_crystal/detonate(mob/living/lanced_by)
. = ..()
update_mob()
@@ -86,10 +75,25 @@
var/distance_from_center = max(get_dist(turf_loc, loc), 1)
var/turf/open/floor_loc = turf_loc
floor_loc.atmos_spawn_air("n2=[n2_gas_amount / distance_from_center];o2=[o2_gas_amount / distance_from_center];TEMP=273")
floor_loc.air_update_turf(FALSE, FALSE)
qdel(src)
/obj/item/grenade/gas_crystal/zauker_crystal/detonate(mob/living/lanced_by)
/obj/item/grenade/gas_crystal/nitrous_oxide_crystal
name = "N2O crystal"
desc = "A crystal made from the N2O gas, you can see the liquid gases inside."
icon_state = "n2o_crystal"
///Range of the grenade air refilling
var/fill_range = 1
///Amount of n2o gas released (close to the grenade)
var/n2o_gas_amount = 10
/obj/item/grenade/gas_crystal/nitrous_oxide_crystal/detonate(mob/living/lanced_by)
. = ..()
update_mob()
playsound(src, 'sound/effects/spray2.ogg', 100, TRUE)
for(var/turf/turf_loc in view(fill_range, loc))
if(!isopenturf(turf_loc))
continue
var/distance_from_center = max(get_dist(turf_loc, loc), 1)
var/turf/open/floor_loc = turf_loc
floor_loc.atmos_spawn_air("n2o=[n2o_gas_amount / distance_from_center];TEMP=273")
qdel(src)
code/game/objects/items/stacks/sheets/mineral.dm
+11
View File
@@ -490,3 +490,14 @@ GLOBAL_LIST_INIT(metalhydrogen_recipes, list(
/obj/item/stack/sheet/mineral/metal_hydrogen/get_main_recipes()
. = ..()
. += GLOB.metalhydrogen_recipes
/obj/item/stack/sheet/mineral/zaukerite
name = "zaukerite"
icon_state = "zaukerite"
inhand_icon_state = "sheet-zaukerite"
singular_name = "zaukerite crystal"
w_class = WEIGHT_CLASS_NORMAL
point_value = 120
mats_per_unit = list(/datum/material/zaukerite = MINERAL_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/mineral/zaukerite
material_type = /datum/material/zaukerite