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

Upstream Merge (This one a biggums) #166

Merged
merged 42 commits into from
Dec 17, 2024
Merged

Upstream Merge (This one a biggums) #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
375d8ea
Adds new station map Nebulastation (#4583)
Zergspower Dec 10, 2024
570de7e
Automatic changelog for PR #4583 [ci skip]
novasector-ci[bot] Dec 10, 2024
c077058
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 11, 2024
68adeff
xenomorph larva can evolve again (#4663)
Kocma-san Dec 11, 2024
b9c5bec
Automatic changelog for PR #4663 [ci skip]
novasector-ci[bot] Dec 11, 2024
adfc95f
Bitrunning Easy mode (#4652)
OrbisAnima Dec 11, 2024
7cca855
Automatic changelog for PR #4652 [ci skip]
novasector-ci[bot] Dec 11, 2024
2a17326
Tweaks to Bitrunning SNPC spawners (and some other things) (but witho…
Stalkeros2 Dec 11, 2024
abfa6a9
Automatic changelog for PR #4615 [ci skip]
novasector-ci[bot] Dec 11, 2024
b799f90
Snowglobe - Disposals Stacker (#4606)
sqnztb Dec 11, 2024
ed85b5f
Automatic changelog for PR #4606 [ci skip]
novasector-ci[bot] Dec 11, 2024
0cae25c
Railgun PKAs can no longer be fired on-station (#4553)
Hardly3D Dec 11, 2024
2f7587e
Automatic changelog for PR #4553 [ci skip]
novasector-ci[bot] Dec 11, 2024
27442ac
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 12, 2024
3ad5d4e
Fixes Icemoon Interdyne Food Vendors (#4671)
sqnztb Dec 12, 2024
328650c
Automatic changelog for PR #4671 [ci skip]
novasector-ci[bot] Dec 12, 2024
ce022c4
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 13, 2024
e232ce1
Sec helmet fixes (#4673)
FlufflesTheDog Dec 13, 2024
2720b54
Automatic changelog for PR #4673 [ci skip]
novasector-ci[bot] Dec 13, 2024
59c370d
[No GBP] Fixes of the Special Bitrunning Vending Machine (#4676)
Stalkeros2 Dec 13, 2024
90902c9
Automatic changelog for PR #4676 [ci skip]
novasector-ci[bot] Dec 13, 2024
bec8910
Slime-hybrid revival fixes (#4666)
FlufflesTheDog Dec 13, 2024
300c29f
Automatic changelog for PR #4666 [ci skip]
novasector-ci[bot] Dec 13, 2024
4f33c35
Build(deps): bump JamesIves/github-pages-deploy-action from 4.6.9 to …
dependabot[bot] Dec 13, 2024
a4dcf21
changes up alot of the underwears to be better shaded, in piecemeal (…
RatFromTheJungle Dec 13, 2024
acc8b75
Automatic changelog for PR #4648 [ci skip]
novasector-ci[bot] Dec 13, 2024
697f179
Snouts, tails, ears for acradors (#4627)
Kush1Push1 Dec 13, 2024
1085875
reduced the items used, and the time to make for most improvised tool…
RatFromTheJungle Dec 13, 2024
bb5778f
Automatic changelog for PR #4627 [ci skip]
novasector-ci[bot] Dec 13, 2024
0e819fa
Automatic changelog for PR #4650 [ci skip]
novasector-ci[bot] Dec 13, 2024
ef053c7
Fixes ears getting sprites they shouldn't be getting when they're set…
GoldenAlpharex Dec 13, 2024
b8ac56f
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 13, 2024
e284714
Automatic changelog for PR #4641 [ci skip]
novasector-ci[bot] Dec 13, 2024
4ecc64b
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 14, 2024
113df4d
[MIRROR] The death or internal/external organ pathing (ft. fixed fox …
FlufflesTheDog Dec 15, 2024
182f61c
Blind-people canes should be allowed to fit in suit storage slots (#4…
MitztheKat Dec 15, 2024
34b470e
Automatic changelog for PR #4631 [ci skip]
novasector-ci[bot] Dec 15, 2024
bb9a1e4
Automatic changelog compile [ci skip]
novasector-ci[bot] Dec 15, 2024
2441594
Allows golem arms to dredge boulders from ore vents (#4511)
JimKil3 Dec 15, 2024
a014d4f
Automatic changelog for PR #4511 [ci skip]
novasector-ci[bot] Dec 15, 2024
decc41e
Merge remote-tracking branch 'nova/master' into upstream
SynthTwo Dec 15, 2024
d57adc6
lizard tail
SynthTwo Dec 17, 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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
pixel_y = 4
},
/obj/item/bodypart/chest,
/obj/item/organ/internal/heart,
/obj/item/organ/heart,
/obj/item/multitool,
/turf/open/floor/iron/freezer,
/area/ruin/powered)
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/IceRuins/icemoon_underground_mining_site.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
/turf/open/misc/ice/icemoon,
/area/icemoon/underground/explored)
"sp" = (
/obj/item/organ/internal/monster_core/regenerative_core/legion{
/obj/item/organ/monster_core/regenerative_core/legion{
time_to_decay = 0;
pixel_x = 11;
pixel_y = 4;
Expand Down Expand Up @@ -273,7 +273,7 @@
/turf/open/misc/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"JP" = (
/obj/item/organ/internal/monster_core/regenerative_core/legion{
/obj/item/organ/monster_core/regenerative_core/legion{
time_to_decay = 0;
pixel_x = -12;
pixel_y = -4;
Expand Down Expand Up @@ -365,7 +365,7 @@
/turf/open/floor/plating/snowed/smoothed/icemoon,
/area/icemoon/underground/explored)
"VT" = (
/obj/item/organ/internal/monster_core/regenerative_core/legion{
/obj/item/organ/monster_core/regenerative_core/legion{
time_to_decay = 0;
pixel_x = 4;
pixel_y = 3;
Expand Down
Loading
Loading