Skip to content

Commit

Permalink
removes some awaymission cruft (#3642)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
tired of seeing it.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed some ancient away mission cruft
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Co-authored-by: Sun-Soaked <[email protected]>
  • Loading branch information
FalloutFalcon and Sun-Soaked authored Oct 28, 2024
1 parent 349e342 commit 14181a5
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 618 deletions.
14 changes: 7 additions & 7 deletions _maps/map_files/generic/CentCom.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3964,34 +3964,34 @@
/area/centcom/evac)
"aLV" = (
/turf/closed/indestructible/riveted,
/area/awaymission/errorroom)
/area/errorroom)
"aLW" = (
/turf/closed/mineral/ash_rock,
/area/awaymission/errorroom)
/area/errorroom)
"aLX" = (
/obj/structure/speaking_tile,
/turf/closed/mineral/ash_rock,
/area/awaymission/errorroom)
/area/errorroom)
"aLY" = (
/obj/item/rupee,
/turf/open/floor/plating/ashplanet/wateryrock{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"aLZ" = (
/turf/open/floor/plating/ashplanet/wateryrock{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"aMa" = (
/obj/effect/landmark/error,
/turf/open/floor/plating/ashplanet/wateryrock{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"aMb" = (
/obj/structure/signpost/salvation{
icon = 'icons/obj/structures.dmi';
Expand All @@ -4002,7 +4002,7 @@
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"aMc" = (
/obj/structure/lattice,
/turf/open/space,
Expand Down
14 changes: 7 additions & 7 deletions _maps/map_files/generic/blank.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
/area/space)
"b" = (
/turf/closed/indestructible/riveted,
/area/awaymission/errorroom)
/area/errorroom)
"p" = (
/turf/closed/mineral/ash_rock,
/area/awaymission/errorroom)
/area/errorroom)
"t" = (
/obj/effect/landmark/error,
/turf/open/floor/plating/ashplanet/wateryrock{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"D" = (
/turf/closed/indestructible/riveted,
/area/start)
Expand All @@ -24,7 +24,7 @@
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"I" = (
/turf/open/floor/holofloor/hyperspace,
/area/space)
Expand All @@ -49,17 +49,17 @@
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"R" = (
/obj/structure/speaking_tile,
/turf/closed/mineral/ash_rock,
/area/awaymission/errorroom)
/area/errorroom)
"T" = (
/turf/open/floor/plating/ashplanet/wateryrock{
initial_gas_mix = "o2=22;n2=82;TEMP=293.15";
planetary_atmos = 0
},
/area/awaymission/errorroom)
/area/errorroom)
"U" = (
/obj/effect/landmark/start/new_player,
/turf/open/floor/plating,
Expand Down
30 changes: 1 addition & 29 deletions code/game/area/areas/away_content.dm
Original file line number Diff line number Diff line change
@@ -1,33 +1,5 @@
/*
Unused icons for new areas are "awaycontent1" ~ "awaycontent30"
*/


// Away Missions
/area/awaymission
name = "Strange Location"
icon_state = "away"
has_gravity = STANDARD_GRAVITY
ambientsounds = AWAY_MISSION
sound_environment = SOUND_ENVIRONMENT_ROOM

/area/awaymission/beach
name = "Beach"
icon_state = "away"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg')

/area/awaymission/errorroom
/area/errorroom
name = "Super Secret Room"
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
has_gravity = STANDARD_GRAVITY

/area/awaymission/vr
name = "Virtual Reality"
icon_state = "awaycontent1"
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
var/pacifist = TRUE // if when you enter this zone, you become a pacifist or not
var/death = FALSE // if when you enter this zone, you die
3 changes: 1 addition & 2 deletions code/game/turfs/open/dirtystation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@
return

//Bathrooms. Blood, vomit, and shavings in the sinks.
var/static/list/bathroom_dirt_areas = typecacheof(list( /area/ship/crew/toilet,
/area/awaymission/research/interior/bathroom))
var/static/list/bathroom_dirt_areas = typecacheof(/area/ship/crew/toilet)
if(is_type_in_typecache(A, bathroom_dirt_areas))
if(prob(40))
if(prob(90))
Expand Down
63 changes: 0 additions & 63 deletions code/modules/awaymissions/mission_code/Academy.dm
Original file line number Diff line number Diff line change
@@ -1,66 +1,3 @@

//Academy Areas

/area/awaymission/academy
name = "Academy Asteroids"
icon_state = "away"

/area/awaymission/academy/headmaster
name = "Academy Fore Block"
icon_state = "away1"

/area/awaymission/academy/classrooms
name = "Academy Classroom Block"
icon_state = "away2"

/area/awaymission/academy/academyaft
name = "Academy Ship Aft Block"
icon_state = "away3"

/area/awaymission/academy/academygate
name = "Academy Gateway"
icon_state = "away4"

/area/awaymission/academy/academycellar
name = "Academy Cellar"
icon_state = "away4"

/area/awaymission/academy/academyengine
name = "Academy Engine"
icon_state = "away4"

//Academy Items

/obj/item/paper/fluff/awaymissions/academy/console_maint
name = "Console Maintenance"
default_raw_text = "We're upgrading to the latest mainframes for our consoles, the shipment should be in before spring break is over!"

/obj/item/paper/fluff/awaymissions/academy/class/automotive
name = "Automotive Repair 101"

/obj/item/paper/fluff/awaymissions/academy/class/pyromancy
name = "Pyromancy 250"

/obj/item/paper/fluff/awaymissions/academy/class/biology
name = "Biology Lab"

/obj/item/paper/fluff/awaymissions/academy/grade/aplus
name = "Summoning Midterm Exam"
default_raw_text = "Grade: A+ Educator's Notes: Excellent form."

/obj/item/paper/fluff/awaymissions/academy/grade/bminus
name = "Summoning Midterm Exam"
default_raw_text = "Grade: B- Educator's Notes: Keep applying yourself, you're showing improvement."

/obj/item/paper/fluff/awaymissions/academy/grade/dminus
name = "Summoning Midterm Exam"
default_raw_text = "Grade: D- Educator's Notes: SEE ME AFTER CLASS."

/obj/item/paper/fluff/awaymissions/academy/grade/failure
name = "Pyromancy Evaluation"
default_raw_text = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons. Suggest additional tutelage."


/obj/singularity/academy
dissipate = 0
move_self = 0
Expand Down
37 changes: 0 additions & 37 deletions code/modules/awaymissions/mission_code/Cabin.dm
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@

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

/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"
desc = "Warm and toasty."
Expand Down
61 changes: 0 additions & 61 deletions code/modules/awaymissions/mission_code/caves.dm

This file was deleted.

50 changes: 0 additions & 50 deletions code/modules/awaymissions/mission_code/centcomAway.dm
Original file line number Diff line number Diff line change
@@ -1,39 +1,3 @@
//centcomAway areas

/area/awaymission/centcomAway
name = "XCC-P5831"
icon_state = "away"
requires_power = FALSE

/area/awaymission/centcomAway/general
name = "XCC-P5831"
ambientsounds = list('sound/ambience/ambigen3.ogg')

/area/awaymission/centcomAway/maint
name = "XCC-P5831 Maintenance"
icon_state = "away1"
ambientsounds = list('sound/ambience/ambisin1.ogg')

/area/awaymission/centcomAway/thunderdome
name = "XCC-P5831 Thunderdome"
icon_state = "away2"
ambientsounds = list('sound/ambience/ambisin2.ogg')

/area/awaymission/centcomAway/cafe
name = "XCC-P5831 Kitchen Arena"
icon_state = "away3"
ambientsounds = list('sound/ambience/ambisin3.ogg')

/area/awaymission/centcomAway/courtroom
name = "XCC-P5831 Courtroom"
icon_state = "away4"
ambientsounds = list('sound/ambience/ambisin4.ogg')

/area/awaymission/centcomAway/hangar
name = "XCC-P5831 Hangars"
icon_state = "away4"
ambientsounds = list('sound/ambience/ambigen5.ogg')

//centcomAway items

/obj/item/paper/pamphlet/centcom/visitor_info
Expand All @@ -47,17 +11,3 @@
serving as a supply and repair depot, as well as being host to its most important legal proceedings\
and the thrilling pay-per-view broadcasts of <i>PLASTEEL CHEF</i> and <i>THUNDERDOME LIVE</i>.<br> \
We hope you enjoy your stay!"

/obj/item/paper/fluff/awaymissions/centcom/gateway_memo
name = "Memo to XCC-P5831 QM"
default_raw_text = "<b>From: XCC-P5831 Management Office</b><br>\
<b>To: Rolf Ingram, XCC-P5831 Quartermaster</b><br>\
Hey, Rolf, once you pack that gateway into the ferry hangar, <i>make absolutely sure</i> \
to deactivate it! As you may know, SS13 has recently got its network up and running, \
which means that until we get this gate shipped off to the next colonization staging \
area, they'll be able to hop straight in here if its hooked up on our end.<br>\
Obviously, that's something I'd very much rather avoid. Our forensics and medical \
teams never did figure out what happened that last time... and I can't wrap my head \
around it myself. Why would a shuttle full of evacuees all snap and beat each other \
to death the moment they reached safety?<br>\
- D. Cereza"
17 changes: 0 additions & 17 deletions code/modules/awaymissions/mission_code/challenge.dm
Original file line number Diff line number Diff line change
@@ -1,20 +1,3 @@
//Challenge Areas

/area/awaymission/challenge/start
name = "Where Am I?"
icon_state = "away"

/area/awaymission/challenge/main
name = "Danger Room"
icon_state = "away1"
requires_power = FALSE

/area/awaymission/challenge/end
name = "Administration"
icon_state = "away2"
requires_power = FALSE


/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
desc = "A heavy duty industrial laser."
Expand Down
Loading

0 comments on commit 14181a5

Please sign in to comment.