cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

renamed calorit into calorite, initialized it into more files

Browse Source 
I think that might be all. Now it's just a matter of coding, testing and spriting.
This commit is contained in:
Sonoida
2023-01-05 14:23:18 +01:00
parent 3b24c6eff1
commit e32566ec40
23 changed files with 139 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/mineral.dm
+14 -14
View File
@@ -280,27 +280,27 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
/*
* Calorit - GS13
* calorite - GS13
*/
/obj/item/stack/sheet/mineral/calorit
name = "calorit"
icon_state = "sheet-calorit"
item_state = "sheet-calorit"
singular_name = "calorit sheet"
sheettype = "calorit"
materials = list(MAT_CALORIT=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/sheet/mineral/calorite
name = "calorite"
icon_state = "sheet-calorite"
item_state = "sheet-calorite"
singular_name = "calorite sheet"
sheettype = "calorite"
materials = list(MAT_CALORITE=MINERAL_MATERIAL_AMOUNT)
novariants = TRUE
grind_results = list(/datum/reagent/consumable/lipoifier = 10)
point_value = 40
merge_type = /obj/item/stack/sheet/mineral/calorit
merge_type = /obj/item/stack/sheet/mineral/calorite
GLOBAL_LIST_INIT(calorit_recipes, list ( \
new/datum/stack_recipe("calorit tile", /obj/item/stack/tile/mineral/calorit, 1, 4, 20), \
// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorit/fatty, 5, one_per_turf = 1, on_floor = 1),
GLOBAL_LIST_INIT(calorite_recipes, list ( \
new/datum/stack_recipe("calorite tile", /obj/item/stack/tile/mineral/calorite, 1, 4, 20), \
// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorite/fatty, 5, one_per_turf = 1, on_floor = 1),
))
/obj/item/stack/sheet/mineral/calorit/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.calorit_recipes
/obj/item/stack/sheet/mineral/calorite/Initialize(mapload, new_amount, merge = TRUE)
recipes = GLOB.calorite_recipes
. = ..()
code/game/objects/items/stacks/tiles/tile_mineral.dm
+8 -8
View File
@@ -52,14 +52,14 @@
mineralType = "bananium"
materials = list(MAT_BANANIUM=500)
/obj/item/stack/tile/mineral/calorit //GS13
name = "calorit tile"
singular_name = "calorit floor tile"
desc = "A tile made out of calorit. Bwwooomphf."
icon_state = "tile_calorit"
turf_type = /turf/open/floor/mineral/calorit
mineralType = "calorit"
materials = list(MAT_CALORIT=500)
/obj/item/stack/tile/mineral/calorite //GS13
name = "calorite tile"
singular_name = "calorite floor tile"
desc = "A tile made out of calorite. Bwoomph."
icon_state = "tile_calorite"
turf_type = /turf/open/floor/mineral/calorite
mineralType = "calorite"
materials = list(MAT_CALORITE=500)
/obj/item/stack/tile/mineral/abductor
name = "alien floor tile"
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+1 -1
View File
@@ -104,7 +104,7 @@
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/mineral/calorit,
/obj/item/stack/sheet/mineral/calorite,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/sheet/mineral/titanium,
/obj/item/stack/sheet/mineral/plastitanium,
code/game/objects/structures/door_assembly_types.dm
+7 -7
View File
@@ -216,14 +216,14 @@
mineral = "bananium"
glass_type = /obj/machinery/door/airlock/bananium/glass
// /obj/structure/door_assembly/door_assembly_calorit //GS13
// name = "calorit airlock assembly"
// /obj/structure/door_assembly/door_assembly_calorite //GS13
// name = "calorite airlock assembly"
// desc = "Very inviting."
// icon = 'icons/obj/doors/airlocks/station/calorit.dmi'
// base_name = "calorit airlock"
// airlock_type = /obj/machinery/door/airlock/calorit
// mineral = "calorit"
// glass_type = /obj/machinery/door/airlock/calorit/glass
// icon = 'icons/obj/doors/airlocks/station/calorite.dmi'
// base_name = "calorite airlock"
// airlock_type = /obj/machinery/door/airlock/calorite
// mineral = "calorite"
// glass_type = /obj/machinery/door/airlock/calorite/glass
/obj/structure/door_assembly/door_assembly_sandstone
name = "sandstone airlock assembly"
code/game/objects/structures/false_walls.dm
+8 -8
View File
@@ -263,14 +263,14 @@
walltype = /turf/closed/wall/mineral/bananium
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
// /obj/structure/falsewall/calorit //GS13
// name = "calorit wall"
// desc = "A wall with calorit plating. Burp."
// icon = 'icons/turf/walls/calorit_wall.dmi'
// icon_state = "calorit"
// mineral = /obj/item/stack/sheet/mineral/calorit
// walltype = /turf/closed/wall/mineral/calorit
// canSmoothWith = list(/obj/structure/falsewall/calorit, /turf/closed/wall/mineral/calorit)
// /obj/structure/falsewall/calorite //GS13
// name = "calorite wall"
// desc = "A wall with calorite plating. Burp."
// icon = 'icons/turf/walls/calorite_wall.dmi'
// icon_state = "calorite"
// mineral = /obj/item/stack/sheet/mineral/calorite
// walltype = /turf/closed/wall/mineral/calorite
// canSmoothWith = list(/obj/structure/falsewall/calorite, /turf/closed/wall/mineral/calorite)
/obj/structure/falsewall/sandstone
code/game/objects/structures/statues.dm
+12
View File
@@ -318,3 +318,15 @@
name = "blueberry statue"
desc = "A statue resembling a poor humanoid creature shaped like a ball."
icon_state = "blueberry"
//////////////////////////////CALORITE - GS13///////////////////////////////
/obj/structure/statue/calorite
max_integrity = 400
material_drop_type = /obj/item/stack/sheet/mineral/calorite
/obj/structure/statue/calorite/fatty
name = "Fatty statue"
desc = "A statue of a well-rounded fatso."
icon_state = "fatty"