Skip to content

Cherrypick - Week 3 - March 15th to March 21th #235

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

Merged
merged 81 commits into from
Apr 14, 2025
Merged

Cherrypick - Week 3 - March 15th to March 21th #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
2369d2f
Mech Paths and 515 EX kit (#4325)
Gristlebee Mar 15, 2025
61e0672
Equalizes DMR Zoom (#4365)
generalthrax Mar 15, 2025
e8cdd95
Genemod Ears no longer take 2x damage at all times (#4364)
generalthrax Mar 15, 2025
be4af41
308 price 250 down from 500 (#4359)
SomeguyManperson Mar 15, 2025
e75a0c1
tape recorder to command pouch (#4366)
Erikafox Mar 15, 2025
caec6d1
Brings .22lr back to 20 (#4351)
generalthrax Mar 15, 2025
aadd883
Language cleanup (#4367)
thgvr Mar 16, 2025
85cc608
Adds Missing Indestructible Rock Turfs (#4360)
kaylexis Mar 16, 2025
bb0df0f
reduces landmines in planetgen (#4352)
Erikafox Mar 16, 2025
a7085f2
TGUI plant analyzer (#4227)
FalloutFalcon Mar 17, 2025
8075c0e
Abandoned Crate Lootpool Adjustments (#4346)
firebudgy Mar 17, 2025
c4587fc
Arke Paperstuff + Gas Masks (#4353)
generalthrax Mar 17, 2025
fb18b5e
tweaks to random spawners (#3644)
FalloutFalcon Mar 17, 2025
cfe236c
swap id consoles into modular ones (#4261)
FalloutFalcon Mar 17, 2025
9f107c4
Gives the Arke-class a command computer (#4336)
Ical92 Mar 17, 2025
3bf2090
Foodening (Food Desc Rewrite) (#4320)
thestripes Mar 17, 2025
e3195ec
radiation storms are usable as weather (#4369)
Erikafox Mar 17, 2025
a07b2cf
ship orbit menu improvments (#4249)
FalloutFalcon Mar 18, 2025
894052c
undos temp tix
Ossa88 Apr 4, 2025
fbe9276
make the star and outpost tokens objects of interest (#4251)
FalloutFalcon Mar 18, 2025
8e80507
Commit: 0e2bc357db5bee0f9540c08a379b2e6ee804d193
Ossa88 Apr 4, 2025
d0432fb
Wrecked Factory Touch Ups (#4117)
Gristlebee Mar 18, 2025
2e86a5c
Removes most the bad decals on the walls of ships (#4292)
FalloutFalcon Mar 18, 2025
59ccb35
Health scanner show structure damage and qol (#4318)
ritorizo Mar 18, 2025
80783bd
Tiny Distillery Tweaks (#4356)
generalthrax Mar 18, 2025
e1b759c
Melee Refactors and Attack Cooldowns (#3964)
FalloutFalcon Mar 18, 2025
e7ddcee
Range check on Rapid Pipe Dispensers (#4391)
Ratvarr Mar 18, 2025
d8fe740
Basic Bulk Fertilizer (#4386)
FalloutFalcon Mar 18, 2025
6e031dc
solcon turrets (#4390)
Erikafox Mar 18, 2025
2176df5
announce mission pay (#4382)
Erikafox Mar 18, 2025
5a6a998
blackbox keys should not have spaces (#4371)
FalloutFalcon Mar 18, 2025
d3c03e8
Hermits use a spawner instead of evil subtype (#4381)
FalloutFalcon Mar 18, 2025
88a5503
Trickwine Fixes (#4222)
FalloutFalcon Mar 18, 2025
2ca694d
changes the clip war correspondent outfits and adds entretainment mon…
meemofcourse Mar 18, 2025
ce0fc0b
blackmarket logging similar to crate_ordered (#4394)
FalloutFalcon Mar 18, 2025
4594bf5
38 trickwine fix (#4392)
SomeguyManperson Mar 18, 2025
7ae5f23
SUNS cape fix (#4383)
Imaginos16 Mar 18, 2025
0d3df5d
Syndicate Hardsuit Helmet Lights (#4354)
Gristlebee Mar 18, 2025
894259c
more ammo box sprites (#4378)
Erikafox Mar 18, 2025
e1f7066
Factions Housekeeping (#3815)
MarkSuckerberg Mar 18, 2025
1a5781a
broadcast camera improvements (#4389)
Erikafox Mar 19, 2025
64d895a
fix evil sleep (#4406)
FalloutFalcon Mar 19, 2025
9a0a4c7
Adds painkiller gameplay to surgery (#4270)
SomeguyManperson Mar 19, 2025
5602e45
Dynamic Missions (Ruin Missions) (#4015)
FalloutFalcon Mar 19, 2025
62a1fd0
Fixes prefixes/faction stuff
Ossa88 Apr 4, 2025
a557ab9
fixes gold core
Ossa88 Apr 4, 2025
4a10a94
broadcast cameras notify entertainment monitors they're broadcasting …
Erikafox Mar 21, 2025
f92eb66
Modsuits 2025 (#4221)
Gristlebee Mar 21, 2025
fdbf4d1
EHF Point Beacons (Planet Preservation) (#4246)
Ical92 Mar 21, 2025
b127668
Fixes people forgetting how to breath (#4409)
FalloutFalcon Mar 21, 2025
4664636
Adds an angle grinder to the Nail (#4269)
DIB-DOG Mar 21, 2025
3a9a582
Adds Green Nitrile Gloves to the Talos, Vaquero, and Colossus (#4374)
firebudgy Mar 21, 2025
e225250
Adds Azuilhauz variants for Vox and Kepori (#4393)
stiel0248 Mar 21, 2025
528a919
Removes Elzuose (and IPC and Phorid) Damage Mods (#4437)
MemeSnorfer Mar 21, 2025
9a71b4f
Sunskipper update (#4304)
Sadhorizon Mar 22, 2025
c18add0
Merge branch 'master' into march15
Ossa88 Apr 4, 2025
2b2e3d1
selling pad?
Ossa88 Apr 4, 2025
7feeba8
Merge branch 'march15' of https://github.com/Ossa88/PentestMain into …
Ossa88 Apr 4, 2025
95d9a8c
fixes paths
Ossa88 Apr 4, 2025
483d888
nuding things
Ossa88 Apr 4, 2025
8417395
LOWER CASE C!
Ossa88 Apr 4, 2025
6cc24d7
fixing empty space
Ossa88 Apr 4, 2025
f5c1162
more map fixes
Ossa88 Apr 4, 2025
a83f425
final fix?
Ossa88 Apr 4, 2025
a3145b6
Minor tweaks to the overmap inspect (#4445)
FalloutFalcon Mar 31, 2025
aa994ca
Kepsuits (#4511)
thgvr Apr 6, 2025
8388083
Modularized PR36 - Hopefully
Ossa88 Apr 6, 2025
7a35e7b
Fixes Preference Menu
Ossa88 Apr 7, 2025
2740234
Fixes Service Borgs not being able to see their silicon knife sprites
Ossa88 Apr 7, 2025
aaeb7c1
I guess i never did save this.... opps.... its commited now.
Ossa88 Apr 7, 2025
2739747
Stop missions from qdeling players 2: Electric Boogaloo (#4509)
FalloutFalcon Apr 6, 2025
b0516c3
Fixes some turning in jank (#4490)
FalloutFalcon Mar 31, 2025
a0b4ede
modularized some food descriptions
Ossa88 Apr 9, 2025
3af1588
beach fish no longer drop carp meat
Ossa88 Apr 9, 2025
3ae51cd
Merge branch 'master' into march15
Ossa88 Apr 9, 2025
5b2a181
Merge branch 'master' into march15
Ossa88 Apr 12, 2025
7668d20
Updated NT Asteroid to include dynamic mission console. Swapped some …
Ossa88 Apr 12, 2025
bb7e56e
Merge branch 'march15' of https://github.com/Ossa88/PentestMain into …
Ossa88 Apr 12, 2025
fbed881
fix to access for junker
Ossa88 Apr 13, 2025
7104fc0
modularized the plump helmet but i get the strong feeling the linter …
Ossa88 Apr 14, 2025
d7120c3
Merge branch 'master' into march15
Ossa88 Apr 14, 2025
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
  •  
  •  
  •  
24 changes: 6 additions & 18 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,7 @@
},
/area/ruin/beach/complex)
"hW" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
/obj/machinery/power/smes/shuttle/precharged,
/obj/structure/window/reinforced{
dir = 8
},
Expand Down Expand Up @@ -699,9 +697,7 @@
},
/area/ruin/beach/complex/wall)
"lU" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/machinery/power/shuttle/engine/electric,
/turf/open/floor/plating,
/area/ruin/beach/complex/shuttle)
"lW" = (
Expand Down Expand Up @@ -2314,9 +2310,7 @@
/turf/open/floor/concrete/slab_4,
/area/ruin/beach/complex)
"Ka" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/machinery/power/shuttle/engine/electric,
/obj/structure/railing{
dir = 1
},
Expand Down Expand Up @@ -2743,9 +2737,7 @@
},
/area/ruin/beach/complex)
"Qr" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
/obj/machinery/power/smes/shuttle/precharged,
/obj/structure/railing{
dir = 1
},
Expand Down Expand Up @@ -3100,9 +3092,7 @@
},
/area/ruin/beach/complex)
"Yo" = (
/obj/machinery/power/smes/shuttle/precharged{
dir = 4
},
/obj/machinery/power/smes/shuttle/precharged,
/obj/structure/railing,
/obj/structure/window/reinforced{
dir = 1
Expand Down Expand Up @@ -3152,9 +3142,7 @@
/turf/open/floor/plasteel/mono,
/area/ruin/beach/complex)
"YM" = (
/obj/machinery/power/shuttle/engine/electric{
dir = 4
},
/obj/machinery/power/shuttle/engine/electric,
/obj/structure/railing,
/turf/open/floor/plating,
/area/ruin/beach/complex/shuttle)
Expand Down
Loading