Adds a Inn ruin for ice planet (#10721)

* stuff

* fixes plating, makes path to shed more obvious
This commit is contained in:
Marmio64
2020-12-31 04:43:08 -06:00
committed by GitHub
parent 646767869a
commit 8630820c80
7 changed files with 1731 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -31,6 +31,12 @@
description = "Just relax and take a dip, nothing will go wrong, I swear!"
suffix = "icemoon_surface_hotsprings.dmm"
/datum/map_template/ruin/icemoon/icemoon_underground_abandoned_village
name = "Inn"
id = "inn"
description = "A small wooden inn with food, drinks, and a place to rest, all maintained by the innkeeper."
suffix = "icemoon_surface_inn.dmm"
// above and below ground together
/datum/map_template/ruin/icemoon/mining_site
@@ -88,6 +94,7 @@
id = "bathhouse"
description = "A taste of paradise, locked in the hell of the Ice Moon."
suffix = "icemoon_underground_bathhouse.dmm"
/datum/map_template/ruin/icemoon/underground/wampacave
name = "Wampa Cave"
id = "wampacave"

View File

@@ -8,4 +8,12 @@
name = "Bath House"
icon_state = "dk_yellow"
mood_bonus = 10
mood_message = "<span class='nicegreen'>This place is like paradise, I don't ever want to leave!\n</span>"
mood_message = "<span class='nicegreen'>This place is like paradise, I don't ever want to leave!\n</span>"
/area/ruin/powered/inn
name = "Inn"
icon_state = "dk_yellow"
/area/ruin/powered/inn/shed
name = "Inn Shed"
icon_state = "dk_yellow"

View File

@@ -597,3 +597,33 @@
/obj/effect/mob_spawn/human/pirate/gunner
rank = "Gunner"
//The Innkeeper, a iceplanet ghostrole for peacefully operating a rest stop complete with food and drinks.
/obj/effect/mob_spawn/human/innkeeper
name = "innkeeper sleeper"
desc = "A standard sleeper designed to keep someone in suspended animation until they are ready to awake."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
outfit = /datum/outfit/innkeeper
id_job = "Bartender"
id_access_list = list(ACCESS_BAR,ACCESS_KITCHEN,ACCESS_HYDROPONICS)
random = TRUE
roundstart = FALSE
death = FALSE
short_desc = "You're a simpleman on a desolate ice land, with the goal of running your inn."
flavour_text = "The electricity bill isn't going to pay itself. Try to get some customers and earn some money at your inn."
assignedrole = "Innkeeper"
/datum/outfit/innkeeper
name = "Innkeeper"
uniform = /obj/item/clothing/under/rank/bartender
head = /obj/item/clothing/head/flatcap
back = /obj/item/storage/backpack
suit = /obj/item/clothing/suit/armor/vest
mask = /obj/item/clothing/mask/cigarette/pipe
shoes = /obj/item/clothing/shoes/sneakers/black
glasses = /obj/item/clothing/glasses/sunglasses/reagent
ears = /obj/item/radio/headset
id = /obj/item/card/id
implants = list(/obj/item/implant/teleporter/innkeeper) //stay at your inn please.
suit_store = /obj/item/gun/ballistic/shotgun/doublebarrel //emergency weapon, ice planets are dangerous, and customers can be too.

View File

@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(exp_jobsmap, list(
GLOBAL_LIST_INIT(exp_specialmap, list(
EXP_TYPE_LIVING = list(), // all living mobs
EXP_TYPE_ANTAG = list(),
EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role"), // Ghost roles
EXP_TYPE_SPECIAL = list("Lifebringer","Ash Walker","Exile","Servant Golem","Free Golem","Hermit","Translocated Vet","Escaped Prisoner","Hotel Staff","SuperFriend","Space Syndicate","Ancient Crew","Space Doctor","Space Bartender","Beach Bum","Skeleton","Zombie","Space Bar Patron","Lavaland Syndicate","Ghost Role","Innkeeper"), // Ghost roles
EXP_TYPE_GHOST = list() // dead people, observers
))
GLOBAL_PROTECT(exp_jobsmap)

View File

@@ -7,6 +7,7 @@
#_maps/RandomRuins/IceRuins/icemoon_surface_shuttle_transit.dmm
#_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
#_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
#_maps/RandomRuins/IceRuins/icemoon_surface_inn.dmm
#_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
#_maps/RandomRuins/IceRuins/icemoon_surface_hotsprings.dmm
#_maps/RandomRuins/IceRuins/icemoon_underground_puzzle.dmm
@@ -16,4 +17,4 @@
#_maps/RandomRuins/IceRuins/icemoon_underground_wrath.dmm
#_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
#_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
#_maps/RandomRuins/IceRuins/icemoon_underground_wampacave.dmm
#_maps/RandomRuins/IceRuins/icemoon_underground_wampacave.dmm

View File

@@ -104,3 +104,8 @@
pointofreturn = /area/ruin/powered/gasstation //for some reason it does not teleport them back to lavaland so I did this to fix it lets just say the gas station clerks implant is a older module
usewhitelist = TRUE
retrievalmessage = "Employee retrieval complete."
/obj/item/implant/teleporter/innkeeper
pointofreturn = /area/ruin/powered/inn
usewhitelist = TRUE
retrievalmessage = "Safety retrieval complete."