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

The North Star: A Nanotrasen Exploratory Vessel #71731

Closed
wants to merge 54 commits into from
Closed

The North Star: A Nanotrasen Exploratory Vessel #71731

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
1ff7f63
Northstar Efforts 1
Cheshify Nov 1, 2022
e6549da
Another update - plenty more to do
Cheshify Nov 2, 2022
1e5d159
More Ordnance work
Cheshify Nov 9, 2022
8007910
More-work
Cheshify Nov 11, 2022
c0c323c
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Nov 23, 2022
f9c18cf
BIG edits, new areas, more content!
Cheshify Dec 2, 2022
1437aeb
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 2, 2022
970d4bb
Playtest Ready!
Cheshify Dec 5, 2022
e804c1e
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 5, 2022
2c36cd9
sensor fix
Cheshify Dec 5, 2022
9fc08ad
Last second medical tweaks
Cheshify Dec 5, 2022
fe5eeb0
mothblock suggestions, more airlocks, fixed CI
Cheshify Dec 5, 2022
d335ef7
2 not -2
Cheshify Dec 5, 2022
34f7c06
multiz_perf but working
Cheshify Dec 5, 2022
54bf43e
Correct at last
Cheshify Dec 5, 2022
609d9a3
multiz-done more Ci fixing
Cheshify Dec 5, 2022
6673a1b
Another Commit - Lotsa fixes
Cheshify Dec 5, 2022
e97a65e
Removes hidden space tile
Cheshify Dec 5, 2022
b0b3a0b
Communite Changes + Possible CI Fix
Cheshify Dec 6, 2022
1394cbd
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 6, 2022
1d74694
Dogs Updated
Cheshify Dec 6, 2022
967967a
innate traits (will not work)
Cheshify Dec 7, 2022
f27e57d
whatever
Fikou Dec 7, 2022
a15a3da
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 7, 2022
709cf10
probably fix
Fikou Dec 7, 2022
84b2cd5
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Fikou Dec 7, 2022
2301fc3
oops
Fikou Dec 7, 2022
4de8f9e
Fixed Linters?
Cheshify Dec 7, 2022
2f494af
fixes
Fikou Dec 7, 2022
b666dd6
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Cheshify Dec 7, 2022
7b4ba3f
Linters: Done
Cheshify Dec 7, 2022
6248cb1
more fixes
Fikou Dec 7, 2022
0bcfedd
oops sorry chesh
Fikou Dec 7, 2022
cd6576d
Lil Fixes
Cheshify Dec 8, 2022
a2dbe9c
Names the Asyum Moth Plush
Cheshify Dec 8, 2022
8944213
Renamed the Asylum Moth
Cheshify Dec 8, 2022
b8cb71c
last fixes
Fikou Dec 8, 2022
79de6c3
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Fikou Dec 8, 2022
57fcb58
oh vell
Fikou Dec 8, 2022
bb5039e
this may be worse but its future proof instead of relying on placement
Fikou Dec 8, 2022
53e5b6a
More Shuttles Part 1
Cheshify Dec 8, 2022
9938bfe
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Cheshify Dec 8, 2022
881c47c
Last Shuttles + Json Updates
Cheshify Dec 8, 2022
892ee77
forgot some turf_passthrough
Cheshify Dec 8, 2022
b3d84d0
trait fixes
Fikou Dec 8, 2022
a78b141
Misc Changes (Not Dead Yet!)
Cheshify Dec 17, 2022
6fb38ff
norandom
Fikou Dec 20, 2022
b6affbd
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Fikou Dec 20, 2022
0e7083f
fixes compile error
Fikou Dec 20, 2022
fcc656f
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 20, 2022
9ec9507
Keeping her up-to-date!
Cheshify Dec 20, 2022
a6a7f6c
Merge branch 'shipmap_chesh' of https://github.com/Cheshify/tgstation…
Cheshify Dec 20, 2022
8d33d45
Merge branch 'master' of https://github.com/tgstation/tgstation into …
Cheshify Dec 25, 2022
3bfee06
Landmarks fix?
Cheshify Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@


#define STATION_TRAIT_ABSTRACT (1<<0)
#define STATION_TRAIT_NORANDOM (1<<1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make sure to documetn these

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whew okay, how should I document these exactly? Just saying what it's for? (Innate Station Traits)


/// The data file that future station traits are stored in
#define FUTURE_STATION_TRAITS_FILE "data/future_station_traits.json"
6 changes: 3 additions & 3 deletions code/controllers/subsystem/processing/station.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ PROCESSING_SUBSYSTEM_DEF(station)
var/list/forced_traits_text_paths = json_decode(forced_traits_contents)
forced_traits_text_paths = SANITIZE_LIST(forced_traits_text_paths)
for(var/trait_text_path in forced_traits_text_paths)
var/station_trait_path = text2path(trait_text_path)
if(!ispath(station_trait_path, /datum/station_trait) || station_trait_path == /datum/station_trait)
var/datum/station_trait/station_trait_path = text2path(trait_text_path)
if(!ispath(station_trait_path, /datum/station_trait) || station_trait_path == /datum/station_trait || initial(station_trait_path.trait_flags) & STATION_TRAIT_ABSTRACT)
var/message = "Invalid station trait path [station_trait_path] was requested in the future station traits!"
log_game(message)
message_admins(message)
Expand All @@ -57,7 +57,7 @@ PROCESSING_SUBSYSTEM_DEF(station)
setup_trait(trait_typepath)
continue

if(initial(trait_typepath.trait_flags) & STATION_TRAIT_ABSTRACT)
if(initial(trait_typepath.trait_flags) & (STATION_TRAIT_ABSTRACT|STATION_TRAIT_NORANDOM))
continue //Dont add abstract ones to it
selectable_traits_by_types[initial(trait_typepath.trait_type)][trait_typepath] = initial(trait_typepath.weight)

Expand Down
8 changes: 4 additions & 4 deletions code/datums/station_traits/innate_traits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/datum/station_trait/trek
name = "Exploratory Uniforms"
trait_type = STATION_TRAIT_ABSTRACT
trait_type = STATION_TRAIT_NORANDOM
weight = 0
show_in_report = TRUE
report_message = "We've issued some uniforms better suited to boldly go where no spaceman has gone before."
Expand Down Expand Up @@ -62,11 +62,11 @@

if(!ishuman(spawned)) //only humans wear stuff
return
if(is_type_in_list(job, blacklisted_roles)) //clowns stay clownin
return
var/mob/living/carbon/human/crewmember = spawned
if(crewmember.dna.species.outfit_important_for_life) //sorry plasmamen
return
var/mob/living/carbon/human/crewmember = spawned
if(is_type_in_list(job, blacklisted_roles)) //clowns stay clownin
return
var/list/department_to_jumpsuit = variation_to_dept[variation]
if(!department_to_jumpsuit)
return
Expand Down