Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compass Headgear now shows your direction when examined #5198

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Compass Headgear now shows your direction when examined #5198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/maps.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ require only minor tweaks.
#define ZTRAIT_FOG "Fog"
#define ZTRAIT_LOCKDOWN "Lockdown"
#define ZTRAIT_BASIC_RT "BasicRT"
#define ZTRAIT_IN_SPACE "InSpace" // Is our ground_level considered in space or on a space station

// boolean - weather types that occur on the level
#define ZTRAIT_SNOWSTORM "weather_snowstorm"
Expand Down
7 changes: 7 additions & 0 deletions code/game/objects/items/props/helmetgarb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,13 @@
icon_state = "compass"
w_class = SIZE_SMALL

/obj/item/prop/helmetgarb/compass/get_examine_text(mob/user)
. = ..()
if(is_ground_level(user.z) && !SSmapping.configs[GROUND_MAP].environment_traits[ZTRAIT_IN_SPACE])
. += SPAN_NOTICE("It seems you are facing [dir2text(user.dir)].")
return
. += SPAN_NOTICE("The needle is not moving.")

/obj/item/prop/helmetgarb/bug_spray
name = "insect repellent"
desc = "A store-brand insect repellent, to keep any variety of pest or mosquito away from you."
Expand Down
3 changes: 2 additions & 1 deletion maps/corsat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"map_file": "Corsat.dmm",
"environment_traits": {
"Lockdown": true,
"COLD": true
"COLD": true,
"InSpace": true
},
"survivor_types": [
"/datum/equipment_preset/survivor/scientist/corsat",
Expand Down
1 change: 1 addition & 0 deletions maps/fiorina_sciannex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.",
"map_item_type": "/obj/item/map/FOP_map_v3",
"announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
"environment_traits": { "InSpace": true },
"traits": [{ "Ground": true }],
"nightmare_path": "maps/Nightmare/maps/FOP_v3_Sciannex/",
"xvx_hives": {
Expand Down
5 changes: 4 additions & 1 deletion maps/prison_station_fop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
"survivor_message": "You are a survivor of the attack on Fiorina Orbital Penitentiary. You worked or lived on the prison station, and managed to avoid the alien attacks... until now.",
"map_item_type": "/obj/item/map/FOP_map",
"announce_text": "An automated distress signal has been received from maximum-security prison \"Fiorina Orbital Penitentiary\". A response team from the ###SHIPNAME### will be dispatched shortly to investigate.",
"environment_traits": { "Lockdown": true },
"environment_traits": {
"Lockdown": true,
"InSpace": true
},
"traits": [{ "Ground": true }],
"nightmare_path": "maps/Nightmare/maps/FOP_v2_Cellblocks/",
"xvx_hives": {
Expand Down
Loading