mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-16 18:36:54 +01:00
small map fixes + continuing to work on calorite
- added a proper dancing pole to one of Pubby's maintbars - changed airlocks to glass airlocks in Box sauna - Meta's shooting range doesn't have windows anymore - added notes to Feeder's Den - routed disposals in Feeder's Den - new space ruin! Fast food restaurant (still gotta add ghostrole junk to it though)
This commit is contained in:
@@ -324,3 +324,9 @@
|
||||
suffix = "feeders_den.dmm"
|
||||
name = "Feeder Den"
|
||||
description = "What used to be a small Syndicate prison and interrogration facility has been taken over by a degenerate madman and turned into a den fit for one purpose - to fatten up its captives."
|
||||
|
||||
/datum/map_template/ruin/space/fastfood //GS13
|
||||
id = "fastfood"
|
||||
suffix = "fastfood.dmm"
|
||||
name = "Fast Food Restaurant"
|
||||
description = "In GATO controlled space, it isn't uncommon to find various space restaurants, famous for the abundance of corn oil in their foods."
|
||||
|
||||
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
|
||||
|
||||
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),
|
||||
new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorite/fatty, 5, one_per_turf = 1, on_floor = 1),
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/mineral/calorite/Initialize(mapload, new_amount, merge = TRUE)
|
||||
|
||||
@@ -53,14 +53,30 @@
|
||||
materials = list(MAT_BANANIUM=500)
|
||||
|
||||
/obj/item/stack/tile/mineral/calorite //GS13
|
||||
name = "calorite tile"
|
||||
singular_name = "calorite floor tile"
|
||||
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/calorite_hide //GS13 - disguised variant
|
||||
name = "Floor tile"
|
||||
singular_name = "calorite floor tile"
|
||||
desc = "A tile totally made out of steel."
|
||||
icon_state = "tile_calorite_hide"
|
||||
turf_type = /turf/open/floor/mineral/calorite_hide
|
||||
|
||||
|
||||
/obj/item/stack/tile/mineral/calorite_strong //GS13 - strong variant
|
||||
name = "Infused calorite tile"
|
||||
singular_name = "Infused calorite floor tile"
|
||||
desc = "A tile made out of stronger variant of calorite. Bwuurp."
|
||||
icon_state = "tile_calorite_strong"
|
||||
turf_type = /turf/open/floor/mineral/calorite_strong
|
||||
|
||||
|
||||
/obj/item/stack/tile/mineral/abductor
|
||||
name = "alien floor tile"
|
||||
singular_name = "alien floor tile"
|
||||
|
||||
@@ -355,12 +355,12 @@
|
||||
spread = 0
|
||||
scan_state = "rock_Bananium"
|
||||
|
||||
// /turf/closed/mineral/calorite //GS13
|
||||
// mineralType = /obj/item/stack/ore/calorite
|
||||
// mineralAmt = 3
|
||||
// spreadChance = 1
|
||||
// spread = 0
|
||||
// scan_state = "rock_calorite"
|
||||
/turf/closed/mineral/calorite //GS13
|
||||
mineralType = /obj/item/stack/ore/calorite
|
||||
mineralAmt = 3
|
||||
spreadChance = 1
|
||||
spread = 0
|
||||
scan_state = "rock_calorite"
|
||||
|
||||
/turf/closed/mineral/bscrystal
|
||||
mineralType = /obj/item/stack/ore/bluespace_crystal
|
||||
|
||||
@@ -42,13 +42,13 @@
|
||||
sheet_type = /obj/item/stack/sheet/mineral/bananium
|
||||
canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium)
|
||||
|
||||
/turf/closed/wall/mineral/calorite //GS13
|
||||
name = "calorite wall"
|
||||
desc = "A wall with calorite plating. Burp."
|
||||
icon = 'icons/turf/walls/calorite_wall.dmi'
|
||||
icon_state = "calorite"
|
||||
sheet_type = /obj/item/stack/sheet/mineral/calorite
|
||||
canSmoothWith = list(/turf/closed/wall/mineral/calorite, /obj/structure/falsewall/calorite)
|
||||
// /turf/closed/wall/mineral/calorite //GS13
|
||||
// name = "calorite wall"
|
||||
// desc = "A wall with calorite plating. Burp."
|
||||
// icon = 'icons/turf/walls/calorite_wall.dmi'
|
||||
// icon_state = "calorite"
|
||||
// sheet_type = /obj/item/stack/sheet/mineral/calorite
|
||||
// canSmoothWith = list(/turf/closed/wall/mineral/calorite, /obj/structure/falsewall/calorite)
|
||||
|
||||
/turf/closed/wall/mineral/sandstone
|
||||
name = "sandstone wall"
|
||||
|
||||
@@ -402,7 +402,7 @@
|
||||
power_draw_per_use = 40
|
||||
ext_cooldown = 1
|
||||
cooldown_per_use = 10
|
||||
var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE MAT_TITANIUM, MAT_BLUESPACE)
|
||||
var/list/mtypes = list(MAT_METAL, MAT_GLASS, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_PLASMA, MAT_URANIUM, MAT_BANANIUM, MAT_CALORITE, MAT_TITANIUM, MAT_BLUESPACE)
|
||||
|
||||
/obj/item/integrated_circuit/manipulation/matman/Initialize()
|
||||
var/datum/component/material_container/materials = AddComponent(/datum/component/material_container,
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
// feeder den, GS13
|
||||
//////// feeder den, GS13
|
||||
|
||||
/obj/item/paper/fluff/ruins/feeder_den/diary/hidden
|
||||
/obj/item/paper/fluff/ruins/feeder_den/hidden
|
||||
name = "hastily scribbled note"
|
||||
info = "It took so long for me to make this hideout, but it might all be in vain. In the short breaks when I'm not observed, I'm trying to fix this radio I managed to sneak by... but judging by how I can barely squeeze my ass past this stupid hole less and less each day, I might not fix it in time..."
|
||||
|
||||
/obj/item/paper/fluff/ruins/feeder_den/diary/report1
|
||||
/obj/item/paper/fluff/ruins/feeder_den/report1
|
||||
name = "Captive report No 1"
|
||||
info = "We've managed to obtain two captives - one woman, and one lizard. They seem promising so far... already quite chunky and eager to scarf down whatever we give them. It might be even easier to turn them into proper beds once we're past the chemical treatment."
|
||||
|
||||
/obj/item/paper/fluff/ruins/feeder_den/diary/report2
|
||||
/obj/item/paper/fluff/ruins/feeder_den/report2
|
||||
name = "Captive report No 2"
|
||||
info = "The woman seems to be showing great progress, we'll be moving her into the larger cell soon. The lizard guy is still a bit reluctant about eating himself into immobility... but no matter, we'll just double his portions. Perhaps a painfully overstuffed stomach will change his mind."
|
||||
|
||||
/obj/item/paper/fluff/ruins/feeder_den/diary/report3
|
||||
/obj/item/paper/fluff/ruins/feeder_den/report3
|
||||
name = "Captive report No 3"
|
||||
info = "We've captured another one! A curious space explorer, snooping near our entrance. Fierce bastard, even managed to cut my arm open! A short treatment of a room full of lipoifier smoke ensured that they won't be able to fit back into their hardsuit."
|
||||
|
||||
/obj/item/paper/fluff/ruins/feeder_den/diary/report4
|
||||
/obj/item/paper/fluff/ruins/feeder_den/report4
|
||||
name = "Captive report No 4"
|
||||
info = "(the page seems to be full of food stains, making the writing unreadable.)"
|
||||
|
||||
Reference in New Issue
Block a user