sleepyyapril
885ee5a831
Wizmerge for Station AI ( #1351 )
...
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->
# Description
the adding AI is now up to y'all because i'm not touching loadout code
for name datasets, but it shouldn't be too bad from here
---------
Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com >
Signed-off-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: ravage <142820619+ravage123321@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Intoxicating-Innocence <188202277+Intoxicating-Innocence@users.noreply.github.com >
Co-authored-by: Saphire <lattice@saphi.re >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: CaasGit <87243814+CaasGit@users.noreply.github.com >
Co-authored-by: BramvanZijp <56019239+BramvanZijp@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com >
Co-authored-by: Doomsdrayk <robotdoughnut@comcast.net >
Co-authored-by: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
Co-authored-by: Julian Giebel <juliangiebel@live.de >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: TGRCDev <tgrc@tgrc.dev >
Co-authored-by: Milon <milonpl.git@proton.me >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
Co-authored-by: Fildrance <fildrance@gmail.com >
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru >
Co-authored-by: chavonadelal <156101927+chavonadelal@users.noreply.github.com >
Co-authored-by: SolStar <44028047+ewokswagger@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: ArchRBX <5040911+ArchRBX@users.noreply.github.com >
Co-authored-by: archrbx <punk.gear5260@fastmail.com >
Co-authored-by: Radezolid <snappednexus@gmail.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: EmoGarbage404 <retron404@gmail.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com >
Co-authored-by: Velcroboy <velcroboy333@hotmail.com >
Co-authored-by: neuPanda <chriseparton@gmail.com >
Co-authored-by: neuPanda <spainman0@yahoo.com >
Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com >
Co-authored-by: Whatstone <whatston3@gmail.com >
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com >
(cherry picked from commit 93ed70acfeda357133a701f637d3faeec02749bb)
2025-01-14 00:13:42 +03:00
Spatison
a2557f75a6
Upstream ( #129 )
2024-11-21 17:49:04 +07:00
SimpleStation14
3b635f1729
Mirror: haunted dungeon template ( #321 )
...
## Mirror of PR #23768 : [haunted dungeon
template](https://github.com/space-wizards/space-station-14/pull/23768 )
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4 "
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards )/[space-station-14](https://github.com/space-wizards/space-station-14 )
###### `952b7f4c4e8e957c0c3765f7b20f2745c9297e27`
PR opened by <img
src="https://avatars.githubusercontent.com/u/99158783?v=4 "
width="16"/><a href="https://github.com/Emisse "> Emisse</a> at
2024-01-09 07:36:29 UTC
---
PR changed 17 files with 4009 additions and 67 deletions.
The PR had the following labels:
---
<details open="true"><summary><h1>Original Body</h1></summary>
> also for sloth when he gets to it
>
> Requires https://github.com/space-wizards/RobustToolbox/pull/4980
</details>
Co-authored-by: SimpleStation14 <Unknown>
2024-05-11 23:14:58 -04:00
Ed
da5758ba4e
Mineshaft ( #25733 )
...
* content
* catwalks
* fix fucking icons
* finish PR
* +1 room
* fix
(cherry picked from commit ace82854406631bad58cd731899fc8e20ef21e65)
2024-03-07 01:24:40 +01:00
Nemanja
3b3e9abb7b
Make procgen use weighted variants ( #24669 )
...
(cherry picked from commit 2a6705818bf510aee3026c7f3c3a4ed56f188189)
2024-02-08 11:54:39 +01:00
metalgearsloth
a430cf15b9
Fix exped dungeons ( #23654 )
...
mapBounds was null after one of my last changes. I changed the transform so it's just passed in directly as I don't think there was an easy way around it.
I checked magnet + roomfills still work.
(cherry picked from commit 34525210210627ee61c13357ecd8fec06735c9d6)
2024-01-26 22:05:10 +01:00
metalgearsloth
0934d6886e
Add RoomFill markers ( #22293 )
...
* Add RoomFill markers
* weh
* Also deez
* Working
* Randomised fills working
* Fixes
* Fix lack of prototypes
* Fix tests
* Fix tests?
(cherry picked from commit f533a1a543af7784f7f9788073a6aae404761022)
2024-01-26 21:35:48 +01:00
metalgearsloth
f128143d13
Salvage magnet revamp ( #23119 )
...
* Generic offering window
* More work
* weh
* Parity
* Progression meter
* magnet
* rona
* PG asteroid work
* code red
* Asteroid spawnings
* clams
* a
* Marker fixes
* More fixes
* Workings of biome asteroids
* A
* Fix this loading code
* a
* Fix masking
* weh
* Fixes
* Magnet claiming
* toe
* petogue
* magnet
* Bunch of fixes
* Fix default
* Fixes
* asteroids
* Fix offerings
* Localisation and a bunch of fixes
* a
* Fixes
* Preliminary draft
* Announcement fixes
* Fixes and bump spawn rate
* Fix asteroid spawns and UI
* More fixes
* Expeditions fix
* fix
* Gravity
* Fix announcement rounding
* a
* Offset tweak
* sus
* jankass
* Fix merge
(cherry picked from commit bf79acd127483d64f96dc23f2e64c74ceb84303d)
2024-01-26 21:35:22 +01:00
Leon Friedrich
8494bd0885
Use ECS prototype-reload events ( #22613 )
...
* Use ECS prototype-reload events
* better constructors
* Maybe this fixes tests?
2023-12-22 23:25:35 +01:00
metalgearsloth
81a5f97a2e
Gateway destinations ( #21040 )
...
* Gateway generation
* Gateway stuff
* gatewehs
* mercenaries
* play area
* Range fixes and tweaks
* weh
* Gateway UI polish
* Lots of fixes
* Knock some items off
* Fix dungeon spawning
Realistically we should probably be using a salvage job.
* wahwah
* wehvs
* expression
* weh
* eee
* a
* a
* WEH
* frfr
* Gatwey
* Fix gateway windows
* Fix gateway windows
* a
* a
* Better layer masking
* a
* a
* Noise fixes
* a
* Fix fractal calculations
* a
* More fixes
* Fixes
* Add layers back in
* Fixes
* namespaces and ftl
* Other TODO
* Fix distance
* Cleanup
* Fix test
2023-11-19 22:09:46 +01:00
metalgearsloth
b1c988627a
Expeditions rework ( #18960 )
2023-09-27 21:59:12 +02:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
7a63238487
Don't spawn mobs on blocked dungeon tiles ( #17910 )
...
a
2023-07-09 13:20:55 -06:00
metalgearsloth
68480af109
Update content vectors to numerics ( #17759 )
2023-07-08 14:08:32 +10:00
Ben
c858c76341
Anchorable shared ( #17422 )
...
Co-authored-by: BenOwnby <ownbyb@appstate.edu >
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2023-06-29 22:35:54 +10:00
metalgearsloth
cca1a78384
Dungeon generation refactor ( #17121 )
2023-06-27 19:17:42 +10:00
Vordenburg
69c6ab5aaf
Add dungeon templates as uninitialized maps ( #17468 )
2023-06-19 23:47:59 +10:00
Leon Friedrich
263e1761fc
Move jobQueue to engine ( #16443 )
2023-05-15 12:47:12 +10:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
metalgearsloth
122350f19c
Salvage expeditions ( #12745 )
2023-04-20 10:43:13 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +10:00
metalgearsloth
b6a735774b
Add more dungeon layouts ( #14924 )
2023-03-30 22:54:17 -07:00
metalgearsloth
d2cf1b8d5d
Shrink clearance for dungeon doors ( #14656 )
...
* Shrink clearance for dungeon doors
I tried adjusting it on engine but it was leading to test assertions on content which scared me.
* a
* comment
2023-03-26 12:07:49 -05:00
metalgearsloth
56d7fe4f62
Add space dungeon support ( #14619 )
2023-03-24 13:19:29 +11:00
metalgearsloth
b0714ca45a
Dungeon fixes ( #14563 )
2023-03-10 21:19:27 +11:00
metalgearsloth
6157dfa3c0
Salvage dungeons ( #14520 )
2023-03-10 16:41:22 +11:00
