Skip to content

Commit

Permalink
Improved Cabin Away Mission (#45618)
Browse files Browse the repository at this point in the history
* The map itself

I hope it won't PR on /tg/station immediately.

* ok lavaland monster dmi thank you

"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*

* cabin building stuff

Still need to merge master.

* Ninja's uniform PR got merged.

Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.

* lmao

* MrDoomBringer forgot a few things

obj/iced_abductor. that's an ayy lmao moment.

Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png

Proof that this works: https://i.imgur.com/MxVO0Og.png

* no more claustrophobic medbay

It doesn't look as good as I want it to. It also feels way too fucking cramped.
  • Loading branch information
ishitbyabullet authored and Rob Bailey committed Aug 5, 2019
1 parent ff75a19 commit 71277af
Show file tree
Hide file tree
Showing 9 changed files with 71,174 additions and 66,496 deletions.
66,487 changes: 0 additions & 66,487 deletions _maps/RandomZLevels/Cabin.dmm

This file was deleted.

71,128 changes: 71,128 additions & 0 deletions _maps/RandomZLevels/SnowCabin.dmm

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions code/game/objects/structures/statues.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,3 +287,8 @@
name = "snowman"
desc = "Several lumps of snow put together to form a snowman."
icon_state = "snowman"

/obj/structure/statue/snow/snowlegion
name = "snowlegion"
desc = "Looks like that weird kid with the tiger plushie has been round here again."
icon_state = "snowlegion"
12 changes: 12 additions & 0 deletions code/modules/antagonists/abductor/ice_abductor.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/obj/structure/fluff/iced_abductor ///Unless more non-machine ayy structures made, it will stay in fluff.
name = "Mysterious Block of Ice"
desc = "A shadowy figure lies in this sturdy-looking block of ice. Who knows where it came from?"
icon = 'icons/effects/freeze.dmi'
icon_state = "ice_ayy"
density = TRUE
deconstructible = FALSE

/obj/structure/fluff/iced_abductor/Destroy()
var/turf/T = get_turf(src)
new /obj/effect/mob_spawn/human/abductor(T)
. = ..()
35 changes: 27 additions & 8 deletions code/modules/awaymissions/mission_code/Cabin.dm
Original file line number Diff line number Diff line change
@@ -1,20 +1,39 @@

/*Cabin areas*/
/area/awaymission/snowforest
name = "Snow Forest"
icon_state = "away"
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED

/area/awaymission/cabin
name = "Cabin"
icon_state = "away2"
requires_power = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED

/area/awaymission/snowforest/lumbermill
/area/awaymission/cabin/snowforest
name = "Snow Forest"
icon_state = "away"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED

/area/awaymission/cabin/snowforest/sovietsurface
name = "Snow Forest"
icon_state = "awaycontent29"
requires_power = FALSE

/area/awaymission/cabin/lumbermill
name = "Lumbermill"
icon_state = "away3"
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED

/area/awaymission/cabin/caves/sovietcave
name = "Soviet Bunker"
icon_state = "awaycontent4"

/area/awaymission/cabin/caves
name = "North Snowdin Caves"
icon_state = "awaycontent15"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED

/area/awaymission/cabin/caves/mountain
name = "North Snowdin Mountains"
icon_state = "awaycontent24"

/obj/structure/firepit
name = "firepit"
Expand Down Expand Up @@ -92,7 +111,7 @@
egg_type = null
speak = list()

/*Cabin's forest*/
/*Cabin's forest. Removed in the new cabin map since it was buggy and I prefer manual placement.*/
/datum/mapGenerator/snowy
modules = list(/datum/mapGeneratorModule/bottomlayer/snow, \
/datum/mapGeneratorModule/snow/pineTrees, \
Expand Down
2 changes: 1 addition & 1 deletion config/awaymissionconfig.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
#_maps/RandomZLevels/caves.dmm
#_maps/RandomZLevels/snowdin.dmm
#_maps/RandomZLevels/research.dmm
#_maps/RandomZLevels/Cabin.dmm
#_maps/RandomZLevels/SnowCabin.dmm
_maps/RandomZLevels/VR/snowdin_VR.dmm
Binary file modified icons/effects/freeze.dmi
Binary file not shown.
Binary file modified icons/obj/statue.dmi
Binary file not shown.
1 change: 1 addition & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,7 @@
#include "code\modules\antagonists\_common\antag_spawner.dm"
#include "code\modules\antagonists\_common\antag_team.dm"
#include "code\modules\antagonists\abductor\abductor.dm"
#include "code\modules\antagonists\abductor\ice_abductor.dm"
#include "code\modules\antagonists\abductor\abductee\abductee_objectives.dm"
#include "code\modules\antagonists\abductor\equipment\abduction_gear.dm"
#include "code\modules\antagonists\abductor\equipment\abduction_outfits.dm"
Expand Down

0 comments on commit 71277af

Please sign in to comment.