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.

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

Make Starfly Build Again #71

Merged
merged 309 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
309 commits
Select commit Hold shift + click to select a range
a657e96
New Rockplanet Ruin: The Abandoned Shipping Dock (Redone Layout) (#2393)
Zevotech May 21, 2024
2453cd0
Automatic changelog generation for PR #2393 [ci skip]
actions-user May 21, 2024
48f28b3
Automatic changelog compile [ci skip]
actions-user May 22, 2024
42bb236
Makes Plastic Flaps no longer airtight (#2969)
Zevotech May 24, 2024
e9f32f4
Automatic changelog generation for PR #2969 [ci skip]
actions-user May 24, 2024
014139b
Removes comms consoles from ships and ruins (#3000)
FalloutFalcon May 24, 2024
3bbf303
Automatic changelog generation for PR #3000 [ci skip]
actions-user May 24, 2024
42797c5
Improved Computer Sprites (#3021)
Imaginos16 May 24, 2024
bb7a1ee
Automatic changelog generation for PR #3021 [ci skip]
actions-user May 24, 2024
82014a3
Fixes small mech laser being unpurchaseable (#2987)
SomeguyManperson May 24, 2024
cffeeb7
Automatic changelog generation for PR #2987 [ci skip]
actions-user May 24, 2024
2e3d566
Automatic changelog compile [ci skip]
actions-user May 25, 2024
01cb1c1
Generic ammo boxes and printable ammo cans (#2940)
Gristlebee May 27, 2024
292cecd
Automatic changelog generation for PR #2940 [ci skip]
actions-user May 27, 2024
abde599
Movable Physics Subsystem (#2880)
Sun-Soaked May 27, 2024
86aeb59
Automatic changelog generation for PR #2880 [ci skip]
actions-user May 27, 2024
1831332
Idle & Active power rework and defines (#2632)
Thera-Pissed May 27, 2024
1a4f9e8
Automatic changelog generation for PR #2632 [ci skip]
actions-user May 27, 2024
a1356a1
Fix ammo check for revolvers (#3025)
Mirag19 May 27, 2024
cce642f
Automatic changelog generation for PR #3025 [ci skip]
actions-user May 27, 2024
d42f6a5
Compactification of survivor loot (#2976)
SomeguyManperson May 27, 2024
06afcee
Automatic changelog generation for PR #2976 [ci skip]
actions-user May 27, 2024
326791c
Changed portable generator sheet burn times (#2882)
Anticept May 27, 2024
8f5303a
Automatic changelog generation for PR #2882 [ci skip]
actions-user May 27, 2024
ea3fc09
Rilena Hoodie Fix (#3018)
Skies-Of-Blue May 27, 2024
808c8a7
Automatic changelog generation for PR #3018 [ci skip]
actions-user May 27, 2024
cfb4f33
Prismwine's burn resistance is no longer goofy (#3011)
SomeguyManperson May 27, 2024
43f7a6b
Automatic changelog generation for PR #3011 [ci skip]
actions-user May 27, 2024
929c1e2
Makes double bedsheets craftable. (#3003)
Martinpachu May 27, 2024
66c82ee
Automatic changelog generation for PR #3003 [ci skip]
actions-user May 28, 2024
ea57239
Removes elzu multitool and emag interaction (#2993)
Gristlebee May 27, 2024
6e0dbe6
Automatic changelog generation for PR #2993 [ci skip]
actions-user May 28, 2024
32c81da
Removes clown/mime fan quirks (#2986)
Zevotech May 27, 2024
2d93e46
Automatic changelog generation for PR #2986 [ci skip]
actions-user May 28, 2024
5483d6a
Automatic changelog compile [ci skip]
actions-user May 28, 2024
79d4142
Holopad Caller History (#3005)
Gristlebee May 27, 2024
9c7b138
Automatic changelog generation for PR #3005 [ci skip]
actions-user May 28, 2024
dd87d96
Choose layers for circulator and engine heater (#2977)
Chituka May 27, 2024
c05ab09
Corrects syndicate mob names (#3029)
Apogee-dev May 28, 2024
0606877
Automatic changelog generation for PR #3029 [ci skip]
actions-user May 28, 2024
ae8f4e3
Blastdoor and Atmos Holofield ID multitool syncing (#3004)
Gristlebee May 28, 2024
dcde44f
Automatic changelog generation for PR #3004 [ci skip]
actions-user May 28, 2024
7252491
Automatic changelog compile [ci skip]
actions-user May 29, 2024
3e9e61d
Adds Representation For The Solarian Marine Biologist's Society (#3032)
Imaginos16 May 29, 2024
72be61a
Automatic changelog generation for PR #3032 [ci skip]
actions-user May 29, 2024
916a276
Automatic changelog compile [ci skip]
actions-user May 30, 2024
334da47
Fixes auto unloading for gate loaded revolvers (#3038)
Gristlebee May 30, 2024
f477356
Automatic changelog generation for PR #3038 [ci skip]
actions-user May 30, 2024
b9cf907
The Mechening: Shiptest Edition (#3035)
Imaginos16 May 30, 2024
fb7db64
Automatic changelog generation for PR #3035 [ci skip]
actions-user May 30, 2024
493ea5f
Quick Mauler Sprite Fix (#3042)
Imaginos16 May 30, 2024
638d7e0
Automatic changelog compile [ci skip]
actions-user May 31, 2024
40ea5a3
Disable roundstart ships (#2822)
thgvr May 31, 2024
60e39a8
Automatic changelog generation for PR #2822 [ci skip]
actions-user May 31, 2024
149dcfb
Legion corpse rework (#2543)
FalloutFalcon May 31, 2024
7e7ffe1
Automatic changelog generation for PR #2543 [ci skip]
actions-user May 31, 2024
1db1dda
Hallucinations Fixes & Tweaks (#3017)
Skies-Of-Blue May 31, 2024
d580319
Automatic changelog generation for PR #3017 [ci skip]
actions-user May 31, 2024
c70a086
Fixes plasma thruster acceleration (#2980)
SomeguyManperson May 31, 2024
8fa9d08
Automatic changelog generation for PR #2980 [ci skip]
actions-user May 31, 2024
084eae0
World Icons (#2279)
Sun-Soaked May 31, 2024
76b12f1
Automatic changelog generation for PR #2279 [ci skip]
actions-user May 31, 2024
301c5c5
Mechening Part 2: Marauder And Seraph (#3049)
Imaginos16 May 31, 2024
374fb48
Automatic changelog generation for PR #3049 [ci skip]
actions-user May 31, 2024
7ca7a82
Kills The British Empire (#3051)
Skies-Of-Blue May 31, 2024
61b713e
Automatic changelog generation for PR #3051 [ci skip]
actions-user May 31, 2024
d823b8b
Constructable Suit Storage Units (#3027)
Gristlebee May 31, 2024
3fe974e
Automatic changelog generation for PR #3027 [ci skip]
actions-user May 31, 2024
5d4c3e5
tweaks to new ore (#3045)
FalloutFalcon May 31, 2024
ff1b4cb
Automatic changelog generation for PR #3045 [ci skip]
actions-user May 31, 2024
823c33f
Automatic changelog compile [ci skip]
actions-user Jun 1, 2024
4d3f4b7
Secret documents black market item properly randomizes its documents …
SomeguyManperson Jun 1, 2024
30f6d48
Automatic changelog generation for PR #3041 [ci skip]
actions-user Jun 1, 2024
00cb67c
Swaps armor values on survivor and explorer armor so survivor armor i…
SomeguyManperson Jun 1, 2024
20163bd
Automatic changelog generation for PR #3043 [ci skip]
actions-user Jun 1, 2024
d24f6a2
Round Join Soul Removal (#3050)
Skies-Of-Blue Jun 1, 2024
e0c2e94
Automatic changelog generation for PR #3050 [ci skip]
actions-user Jun 1, 2024
2edd720
Automatic changelog compile [ci skip]
actions-user Jun 2, 2024
4bbd8fb
Hostile humans (#2972)
FalloutFalcon Jun 2, 2024
b0d28b6
Automatic changelog generation for PR #2972 [ci skip]
actions-user Jun 2, 2024
f2cdd50
Bandoliers now hold 40 items as intended (#3014)
SomeguyManperson Jun 2, 2024
0784ce6
Automatic changelog generation for PR #3014 [ci skip]
actions-user Jun 2, 2024
f1b9477
You cna no longer saw off guns with knives (#3028)
SomeguyManperson Jun 2, 2024
d1ededc
Automatic changelog generation for PR #3028 [ci skip]
actions-user Jun 2, 2024
37d5491
Thrown Thing Improvments (#2950)
FalloutFalcon Jun 2, 2024
5cb5989
Automatic changelog generation for PR #2950 [ci skip]
actions-user Jun 2, 2024
fe03c93
Smokers can now pick what they smoke (#2964)
FalloutFalcon Jun 2, 2024
3bf1d38
Automatic changelog generation for PR #2964 [ci skip]
actions-user Jun 2, 2024
f3315eb
Removes weaknesses and banes (#2974)
FalloutFalcon Jun 2, 2024
59e2fdd
Automatic changelog generation for PR #2974 [ci skip]
actions-user Jun 2, 2024
5b939c3
stops free circut board from drying rack (#2983)
FalloutFalcon Jun 2, 2024
3f8ab9a
Automatic changelog generation for PR #2983 [ci skip]
actions-user Jun 2, 2024
5115912
Minor fixes and improvement to Flavor Text (#2952)
Hardly3D Jun 2, 2024
c8ef93c
Automatic changelog generation for PR #2952 [ci skip]
actions-user Jun 2, 2024
9bb6b54
Moves most vendor items out of contraband. (#3007)
Sadhorizon Jun 2, 2024
ebdcea2
Automatic changelog generation for PR #3007 [ci skip]
actions-user Jun 2, 2024
c8475ba
Cleans up CODEOWNERS and adds myself to it (#3010)
FalloutFalcon Jun 2, 2024
582471f
Automatic changelog generation for PR #3010 [ci skip]
actions-user Jun 2, 2024
049925a
Fixes create and destory failure due to missing physiology (#2999)
FalloutFalcon Jun 2, 2024
55874dc
Automatic changelog generation for PR #2999 [ci skip]
actions-user Jun 2, 2024
2395e99
camera/autoname/LateInitialize() optimization (#3001)
FalloutFalcon Jun 2, 2024
b9d7efd
Automatic changelog generation for PR #3001 [ci skip]
actions-user Jun 2, 2024
c55275f
Asteroid ore veins (#3012)
Gristlebee Jun 2, 2024
121fea0
Automatic changelog generation for PR #3012 [ci skip]
actions-user Jun 2, 2024
f4b6f59
Makes the brimstone shoot faster (#3055)
SomeguyManperson Jun 2, 2024
99325ce
Automatic changelog generation for PR #3055 [ci skip]
actions-user Jun 2, 2024
dc5c4da
fixes shotgun casing bounce sounds (#3057)
Sun-Soaked Jun 2, 2024
4568431
Automatic changelog generation for PR #3057 [ci skip]
actions-user Jun 2, 2024
f959e96
Tweak Death (#3058)
Sun-Soaked Jun 2, 2024
f79339a
Automatic changelog generation for PR #3058 [ci skip]
actions-user Jun 2, 2024
9f591a1
Hallucination anomalies now affect people who don't have research sca…
SomeguyManperson Jun 2, 2024
eaddde1
Automatic changelog generation for PR #3023 [ci skip]
actions-user Jun 2, 2024
a1c53bc
Granularizes defib crate at the outpost (#3040)
Gristlebee Jun 2, 2024
8677096
Automatic changelog generation for PR #3040 [ci skip]
actions-user Jun 2, 2024
4bda105
granularizes a handfully of supply packs (#3044)
FalloutFalcon Jun 2, 2024
12d8b17
Automatic changelog generation for PR #3044 [ci skip]
actions-user Jun 2, 2024
e97cee3
Granularizes mech equipment (#3039)
Gristlebee Jun 2, 2024
a9d83ca
Automatic changelog generation for PR #3039 [ci skip]
actions-user Jun 2, 2024
94534f3
Examine text improvments to humans and id cards (#3031)
FalloutFalcon Jun 2, 2024
8a5ca88
Automatic changelog generation for PR #3031 [ci skip]
actions-user Jun 2, 2024
caf3014
Enables ship-specific access by default & updates some ship configs (…
Apogee-dev Jun 2, 2024
7df98b5
Automatic changelog generation for PR #2989 [ci skip]
actions-user Jun 2, 2024
786028f
Mindbreaker Tweak (#3052)
Skies-Of-Blue Jun 2, 2024
861735d
Automatic changelog generation for PR #3052 [ci skip]
actions-user Jun 2, 2024
41aedd0
Ports timed_action_flags & centralizes do_afters (#2865)
Tsar-Salat Jun 2, 2024
850f969
Automatic changelog generation for PR #2865 [ci skip]
actions-user Jun 2, 2024
aaae765
Removes bulk ammo boxes from webbing storage (#3062)
Apogee-dev Jun 2, 2024
c01a0e5
Automatic changelog generation for PR #3062 [ci skip]
actions-user Jun 2, 2024
2408bc2
Kills legion disease cause its bad and weird (#3047)
FalloutFalcon Jun 2, 2024
a7079a8
Automatic changelog generation for PR #3047 [ci skip]
actions-user Jun 2, 2024
74238eb
Adds a salve that allows elzuose to change color (#2995)
Zevotech Jun 2, 2024
7763fb6
Automatic changelog generation for PR #2995 [ci skip]
actions-user Jun 2, 2024
3d79ed4
Removes the nonfunctioning coffee machines (#3015)
Zevotech Jun 2, 2024
d8ec3fb
Automatic changelog generation for PR #3015 [ci skip]
actions-user Jun 2, 2024
bac506f
.45-70 Specialty Ammo (#2991)
generalthrax Jun 2, 2024
2d692fd
Tweaks Runner-class and replaces weapons with factory subtype on the …
meemofcourse Jun 2, 2024
0365e81
Automatic changelog generation for PR #3059 [ci skip]
actions-user Jun 2, 2024
1102dc0
Admin and Debug Tab QOL (#2956)
FalloutFalcon Jun 2, 2024
d9fd6fe
Automatic changelog generation for PR #2956 [ci skip]
actions-user Jun 2, 2024
e188a2f
Ports a super small TG signal optimization (#3053)
Sun-Soaked Jun 2, 2024
191eefe
Automatic changelog generation for PR #3053 [ci skip]
actions-user Jun 2, 2024
e308fac
Removes sexy clown & mime costumes from costume spawners (#3064)
Sun-Soaked Jun 2, 2024
96d784f
Automatic changelog generation for PR #3064 [ci skip]
actions-user Jun 2, 2024
2730b4b
makes plant analyzer usable (#3054)
FalloutFalcon Jun 2, 2024
2629c35
Automatic changelog generation for PR #3054 [ci skip]
actions-user Jun 2, 2024
ab79978
Improves the language used in trickwines for brewers (#3020)
FalloutFalcon Jun 2, 2024
24de872
Automatic changelog generation for PR #3020 [ci skip]
actions-user Jun 2, 2024
f7fd03a
Empty Gun Helper (#2954)
FalloutFalcon Jun 2, 2024
18e2d1f
Automatic changelog generation for PR #2954 [ci skip]
actions-user Jun 2, 2024
c9e2204
Automatic changelog compile [ci skip]
actions-user Jun 3, 2024
b115e49
Fix shadow AP bonus (#3065)
SomeguyManperson Jun 4, 2024
27992f5
Automatic changelog generation for PR #3065 [ci skip]
actions-user Jun 4, 2024
9b14e5a
No more crusher trophy effects (#3046)
FalloutFalcon Jun 4, 2024
387fc59
Automatic changelog generation for PR #3046 [ci skip]
actions-user Jun 4, 2024
f1e8f62
Update Dockerfile
MarkSuckerberg Jun 4, 2024
09f2957
Update Dockerfile
MarkSuckerberg Jun 4, 2024
07aafaf
Update Dockerfile
MarkSuckerberg Jun 4, 2024
e8bc9ab
Update Dockerfile
MarkSuckerberg Jun 4, 2024
f463852
Broken bones now hurt less on rollerbeds (#3024)
SomeguyManperson Jun 4, 2024
57937c7
Automatic changelog generation for PR #3024 [ci skip]
actions-user Jun 4, 2024
73b825e
i broke codeowner (#3068)
FalloutFalcon Jun 4, 2024
492c19a
Automatic changelog generation for PR #3068 [ci skip]
actions-user Jun 4, 2024
40a0a60
Automatic changelog compile [ci skip]
actions-user Jun 5, 2024
7477965
Revokes hermit immortality snail deals (#3069)
SomeguyManperson Jun 5, 2024
194b597
Automatic changelog generation for PR #3069 [ci skip]
actions-user Jun 5, 2024
c8d2262
Automatic changelog compile [ci skip]
actions-user Jun 6, 2024
4dde7ad
Ashwalker Shrine Remap (#2931)
Zevotech Jun 6, 2024
f57c31c
Automatic changelog generation for PR #2931 [ci skip]
actions-user Jun 6, 2024
498f559
Knife visibility quick fix (#3079)
Sun-Soaked Jun 6, 2024
1c15691
Automatic changelog generation for PR #3079 [ci skip]
actions-user Jun 6, 2024
c586916
small pr to make firemode code easier | or, how firemode code was so …
rye-rice Jun 6, 2024
1a99384
Automatic changelog generation for PR #3061 [ci skip]
actions-user Jun 6, 2024
952ab8b
Automatic changelog compile [ci skip]
actions-user Jun 7, 2024
bb10642
Removes magic stuff adjacent to gun/magic (#2877)
FalloutFalcon Jun 7, 2024
5ee9a62
Automatic changelog generation for PR #2877 [ci skip]
actions-user Jun 7, 2024
6b05aed
Removes the Scary Comment Errorer (#3082)
Sun-Soaked Jun 7, 2024
5474eac
Automatic changelog generation for PR #3082 [ci skip]
actions-user Jun 7, 2024
af3f029
Gunslinger fix (#3081)
SomeguyManperson Jun 7, 2024
9eae1c0
Automatic changelog generation for PR #3081 [ci skip]
actions-user Jun 7, 2024
3b4e076
[IDB IGNORE]Kepori Visual Overhaul (#2892)
thgvr Jun 7, 2024
df6edbf
Automatic changelog generation for PR #2892 [ci skip]
actions-user Jun 7, 2024
472d093
Fixes a broken icon state on corpo sofas (#3085)
Apogee-dev Jun 8, 2024
6ff03bc
Automatic changelog generation for PR #3085 [ci skip]
actions-user Jun 8, 2024
acbdd45
Automatic changelog compile [ci skip]
actions-user Jun 8, 2024
0449e6d
handrails (#3002)
fighterslam Jun 8, 2024
c9bf77d
Separates bleeding from damage, gauze now STOPS bleeding rather than …
SomeguyManperson Jun 8, 2024
5597974
Automatic changelog generation for PR #3009 [ci skip]
actions-user Jun 8, 2024
f11a7aa
THE RUINCUT [AFFRONT TO GOD] (#3026)
Zevotech Jun 8, 2024
e242a9a
Automatic changelog generation for PR #3026 [ci skip]
actions-user Jun 8, 2024
193eff9
Automatic changelog compile [ci skip]
actions-user Jun 9, 2024
42d8d67
Genemod DLC: Of Rabbits and Wolves (#3083)
Skies-Of-Blue Jun 9, 2024
28878b0
Automatic changelog generation for PR #3083 [ci skip]
actions-user Jun 9, 2024
6fdc95b
Frontiersmen-Ening Part 1: Clothes! (#3087)
Imaginos16 Jun 9, 2024
3a2324d
Automatic changelog generation for PR #3087 [ci skip]
actions-user Jun 9, 2024
ba8c32d
Automatic changelog compile [ci skip]
actions-user Jun 10, 2024
7d08f71
re:eggbox (#3074)
rye-rice Jun 10, 2024
8be6d19
Automatic changelog generation for PR #3074 [ci skip]
actions-user Jun 10, 2024
2c8bcd8
Repaths switchblades under kitchen knifes (#3093)
Gristlebee Jun 10, 2024
ff3b9c9
Automatic changelog generation for PR #3093 [ci skip]
actions-user Jun 10, 2024
859931f
Members of the PGF start knowing Kalixcian Common (#3090)
meemofcourse Jun 10, 2024
5bc6d36
Automatic changelog generation for PR #3090 [ci skip]
actions-user Jun 10, 2024
5f279a0
Adds pickaxes to the autolathe. (#3037)
Sadhorizon Jun 10, 2024
e91c06f
Automatic changelog generation for PR #3037 [ci skip]
actions-user Jun 10, 2024
63b2ff9
Automatic changelog compile [ci skip]
actions-user Jun 11, 2024
58a7ef0
Misc. SUNS Content (#3092)
meemofcourse Jun 12, 2024
7e1adc7
Automatic changelog generation for PR #3092 [ci skip]
actions-user Jun 12, 2024
494681f
The Wrecked Factory Ruin (#2943)
Gristlebee Jun 12, 2024
bfefe40
Automatic changelog generation for PR #2943 [ci skip]
actions-user Jun 12, 2024
5910eb7
Sunskipper-class Culinary Vessel - the Boyardee replacement. Also, a …
Sadhorizon Jun 12, 2024
25b3614
Automatic changelog generation for PR #2836 [ci skip]
actions-user Jun 12, 2024
4626817
Adds tech shells to the outpost market, recipe rebalance and buffs (#…
Gristlebee Jun 12, 2024
78991c5
Automatic changelog generation for PR #2958 [ci skip]
actions-user Jun 12, 2024
63fc26e
Removes Chaplain Magic (#2936)
FalloutFalcon Jun 12, 2024
af715bd
Automatic changelog generation for PR #2936 [ci skip]
actions-user Jun 12, 2024
a3b847c
Hardliner Rework Part 2: More Clothing and Roles! (#3098)
Imaginos16 Jun 12, 2024
1a29868
Automatic changelog generation for PR #3098 [ci skip]
actions-user Jun 12, 2024
3365e60
Makes more exosuit equipment available through cargo (#3060)
MemeSnorfer Jun 12, 2024
ee56032
Automatic changelog compile [ci skip]
actions-user Jun 13, 2024
b9bc172
Fixes Posibrains/MMI pilots being permaslept on mech destruction (#3…
Gristlebee Jun 13, 2024
365c7d3
Automatic changelog generation for PR #3101 [ci skip]
actions-user Jun 13, 2024
11f2347
Automatic changelog compile [ci skip]
actions-user Jun 14, 2024
cff2270
Concrete-ening: 3/4ths Edition (#3106)
Imaginos16 Jun 14, 2024
7076579
Automatic changelog generation for PR #3106 [ci skip]
actions-user Jun 14, 2024
e4e21c8
Automatic changelog compile [ci skip]
actions-user Jun 15, 2024
d0d7aeb
Adds one Raksha Helmet to the sergeant's locker on the PGFN Crying Su…
DIB-DOG Jun 15, 2024
f855059
Automatic changelog generation for PR #3096 [ci skip]
actions-user Jun 15, 2024
73e70af
Automatic changelog compile [ci skip]
actions-user Jun 16, 2024
40cf3d4
Additional SUNS decals i missed, creates a decals folder (#3104)
meemofcourse Jun 16, 2024
381a125
Automatic changelog generation for PR #3104 [ci skip]
actions-user Jun 16, 2024
3051f1b
Automatic changelog compile [ci skip]
actions-user Jun 17, 2024
5f2bf07
Revert to Update from Shiptest on 2024-05-07
blinkdog Jun 17, 2024
fd09d19
Update from Shiptest on 2024-06-16
blinkdog Jun 17, 2024
b4d0e5b
Add build checks to GitHub Actions CI
blinkdog Jun 17, 2024
2f737ca
Fix up path issues in CI check
blinkdog Jun 17, 2024
7b24589
Third time is the CI charm
blinkdog Jun 17, 2024
ee7bb66
Updating the Mecha Icons
blinkdog Jun 19, 2024
79560f4
Ramzi Clique Salvage Pilot
blinkdog Jun 19, 2024
54b70d9
Fix up duplicated logic in revolver/rack()
blinkdog Jun 19, 2024
85c52f8
Constructable Suit Storage Units
blinkdog Jun 19, 2024
4797715
Gun Lore Update
blinkdog Jun 19, 2024
eb1e7f6
Makes Sinta'Unathi Playable Again
blinkdog Jun 19, 2024
1ad4b08
Ship spawn adjustments
blinkdog Jun 19, 2024
c8c468c
Kills-legion-disease-cause-its-bad-and-weird
blinkdog Jun 19, 2024
7a5fa1b
SSD-Indicators-Will-Be-Real-In-2020
blinkdog Jun 19, 2024
954e6c9
Command-bar-typing-indicators
blinkdog Jun 19, 2024
d5b0e31
Command-bar-typing-indicators-part-2
blinkdog Jun 19, 2024
65edc5b
Point autowiki at Starfly wiki
blinkdog Jun 19, 2024
b546832
PGF to Epsilon Eridani conversion
blinkdog Jun 19, 2024
f76a5c5
Add Roseus Galactic faction with prefix
blinkdog Jun 20, 2024
d954f60
Remove duplicate NGR clothing
blinkdog Jun 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
33 changes: 25 additions & 8 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,39 @@
# In the event that multiple org members are to be informed of changes
# to the same file or dir, add them to the end under Multiple Owners

# MarkSuckerberg
/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
/code/modules/shuttle/ @MarkSuckerberg
/code/modules/overmap/ @MarkSuckerberg

# Teams
# TEAMS

# Map Maintainers
/_maps/ @shiptest-ss13/maptainers

# Sprite Maintainers
/icons/ @shiptest-ss13/spritetainers
/whitesands/icons/ @shiptest-ss13/spritetainers

# CI and tool chains
/tools/ @shiptest-ss13/admins

#SIC SEMPER TYRANNIS

# MAINTAINERS

# FalloutFalcon

/code/game/objects/items/storage/ration.dm @FalloutFalcon
/code/modules/food_and_drinks/drinks/drinks/breakawayflask.dm @FalloutFalcon
/code/modules/food_and_drinks/food/ration.dm @FalloutFalcon
/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @FalloutFalcon
/code/modules/projectiles/ @FalloutFalcon
/code/modules/reagents/chemistry/reagents/trickwine_reagents.dm @FalloutFalcon
/code/modules/unit_tests/icons/ @FalloutFalcon

# MarkSuckerberg

/code/controllers/subsystem/shuttle.dm @MarkSuckerberg
/code/modules/shuttle/ @MarkSuckerberg
/code/modules/overmap/ @MarkSuckerberg
/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @MarkSuckerberg


# CONTRIBUTORS


# MULTIPLE OWNERS
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
add: Added new things
add: Added more things
del: Removed old things
tweak: tweaked a few things
balance: rebalanced something
fix: fixed a few things
soundadd: added a new sound thingy
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build Linux
on:
push:
branches:
- master
pull_request:
branches:
- master
merge_group:
branches:
- master

jobs:
build_linux:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: "Build (Linux)"
runs-on: ubuntu-latest
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Install BYOND
run: tools/starfly/ci/install_byond_linux.sh

- name: Build Project
run: |
source ${HOME}/BYOND/byond/bin/byondsetup
tools/build/build --ci dm -DCIBUILDING -DCITESTING -DALL_MAPS -DFULL_INIT
25 changes: 25 additions & 0 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build Windows
on:
push:
branches:
- master
pull_request:
branches:
- master
merge_group:
branches:
- master

jobs:
test_windows:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
name: "Build (Windows)"
runs-on: windows-latest
steps:
- name: Checkout Project
uses: actions/checkout@v3

- name: Build Project
run: pwsh tools/starfly/ci/build.ps1
env:
DM_EXE: "C:\\byond\\bin\\dm.exe"
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM beestation/byond:515.1616 as base
FROM beestation/byond:515.1633 as base

# Install a MariaDB development package for the shared library
FROM base as mariadb_library
Expand All @@ -20,8 +20,8 @@ RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl ca-certificates gcc-multilib \
g++-multilib libc6-i386 zlib1g-dev:i386 \
libssl-dev:i386 pkg-config:i386 git \
clang g++-multilib libc6-i386 \
zlib1g-dev:i386 pkg-config:i386 git \
&& /bin/bash -c "source dependencies.sh \
&& curl https://sh.rustup.rs | sh -s -- -y -t i686-unknown-linux-gnu --no-modify-path --profile minimal --default-toolchain \$RUST_VERSION" \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -33,7 +33,7 @@ RUN git init \
&& /bin/bash -c "source dependencies.sh \
&& git fetch --depth 1 origin \$RUST_G_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo build --release --features all --target i686-unknown-linux-gnu
&& cargo build --release --target i686-unknown-linux-gnu

# Build auxmos
FROM rust-build as auxmos
Expand All @@ -42,7 +42,7 @@ RUN git init \
&& git remote add origin \$AUXMOS_REPO \
&& git fetch --depth 1 origin \$AUXMOS_VERSION" \
&& git checkout FETCH_HEAD \
&& cargo rustc --target=i686-unknown-linux-gnu --release --features all_reaction_hooks,katmos -- -C target-cpu=native
&& env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"

# Install nodejs which is required to deploy Shiptest
# NOTE: See: https://github.com/nodesource/distributions/discussions/1639
Expand Down
42 changes: 42 additions & 0 deletions TODO-commits.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

X = compiles without errors
- = introduces new compile errors
^ = inherits compile errors; no new errors introduced
@ = resolved without a cherry pick
* = resolved
! = skipped; not necessary to merge

[@] c88b2633a20c83dfba5ed401df7f975242d99664 Update from Shiptest on 2024-05-07
[@] 8edf84f54790db070c9ec563ed1227f7cda13d75 Updating computers
[@] 3db454e5d0cc9c77473bd552eab947103102dc77 Changing How Hallucinations work
[*] 559492835f9ba8f4f9a95ceaff8407bb103414dc Updating the Mecha Icons
[*] 17197b2c53a05738c56a1e0cd5cab6259401700a Code/modules/mob/living/simple animal/hostile /syndicate
[*] e2e37e2857adfae1d4b0c30582ca4c8bf4f765d1 updated revolver
[*] c7796a52eb4abfe0983a637fff0783efaf976fe1 Constructable Suit Storage Units part 1
[*] 5cdc04bcba1d594878be878d80ab713cb67278c8 Constructable Suit Storage Units part 2
[@] 69820b0b662fad1657dfa6fdb3cda9427cfc4a19 Constructable Suit Storage Units part 3
[*] 2dab8af3a192f6705c4d42e3fcb2a558a47803d6 Constructable Suit Storage Units part 4 (final)
[*] de71c609003df6a255c22d50fe47100f827f76fc Gun Lore Update
[@] 4b727c9f03905a2d113e169474f23f11433df546 Armor value changes
[@] 17efcbf73d4e15789f90bddfacea6286f950ab4d Defib cargo/station
[@] 61d82bda46ee76216524c12f73f71832a789b6ba secret documents randomization
[@] 21162817d06e60b8bcce6a4c970a9577643236dc soul removal 1
[*] 5dbf574b2fe63c492f5a27d2f4b2d0c47201ad3b Makes Sinta'Unathi playable again.
[*] 11b7bc7ea21c875d3a1b419ae5d3acd83a40ef50 Ship spawn adjustments
[*] fa0eb54c7a03fcddb94de87450d3df2fe7264a76 Kills-legion-disease-cause-its-bad-and-weird
[@] 21709d390eef4fa1cbab5af1d8d0919b978f8173 Mindbreaker Tweak
[@] a0ae6ee50f7dcc336843897d508128518a6b1245 Ports-a-super-small-TG-signal-optimization
[@] 4bb50ced53aff3902a0c87bd47ae63887d5efa2d makes-plant-analyzer-usable
[@] d830853fa2cf567ad15a167242698a16b86546ed no-more-ammo-boxes-in-sec-belts
[@] ee1c8e30a5b4afa865a37b82173a509b12d829b7 Fix-shadow-AP-bonus
[*] 55268e0620e0af5d2e5f9cb50246c72e173c9325 SSD-Indicators-Will-Be-Real-In-2020-
[@] 21fe09b54c2d2fa776b0a47b55740d2411e63403 respriting egg boxes
[@] f165b98f242246de7a2ed737c074f155e57ccbe0 Knife-visibility-quick-fix
[*] 44764d96d10f46c5e37a89160a64621779a4a841 Ports-'Command-bar-typing-indicators-(client-side-html-version)
[!] f50415cec86c0ec80bac750f2201b5291f1f49ee restores ballistic.dm [[[fixes 1 error]]]

[*] fe043b3614603fe5d28c69cb2dfe12c08ea66a7c --> Restoring missing files...?

[!] c3f892d6d78ac8db7802aed8a6fa84b87fc7dea1 direct lift
[*] 38c812c433b3e2936e343199b26c4d3fcce51561 More files included, PGF to Epsilon Eridani conversion
[!] cbdaaf98c0c1fb602cdcd9343fd127c286686808 I'm... rapidly losing confidence in this.
Loading
Loading