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
VMSolidus
be81b29754
Undo Accidental Revert Of Rampant Brand Intelligence ( #947 )
...
# Description
Rampant Brand Intelligence was apparently accidentally reverted by
https://github.com/Simple-Station/Einstein-Engines/pull/794 , and I
didn't realize it until the MobMimic Heisentest mysteriously returned. I
apologize that it took me so long to realize that meant we were missing
an entire event.
This is all still shitcode, so at *some point* I'm still probably going
to revisit this whenever I get around to it.
# Changelog
🆑
- fix: Rampant Brand Intelligence has been unreverted. It was reverted
by complete accident a few weeks ago. I apologize to anyone who missed
the thrill of killing murderous vending machines.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com >
Co-authored-by: Remuchi <72476615+Remuchi@users.noreply.github.com >
2024-10-19 13:25:12 +07:00
VMSolidus
08822e34ba
Cherry-Pick Antag Refactor ( #734 )
...
This cherry-pick's Wizden's Antag Refactor, which is needed for all
future antag updates, as well as for me to cherry-pick over Cultists(Who
are going to need some editing to fit the antag refactor), Changelings,
Heretics, and Wizards. I actually selected the White-Dream-Public
version of the Antag Refactor, due to it having commits made tailored to
our repository, so it comes prepackaged with all the changes necessary
for our repo-specific content.
https://github.com/frosty-dev/ss14-wwdp/pull/10
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com >
Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com >
Co-authored-by: Jeff <velcroboy333@hotmail.com >
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com >
Co-authored-by: Timemaster99 <elijahrobot@gmail.com >
Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com >
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com >
Co-authored-by: Azzy <azzydev@icloud.com >
2024-08-15 10:11:48 -07:00
VMSolidus
185e9dfb37
fixes
...
Update coats.yml
Update books.yml
Hack solution for missing sprite
Fix more missing items
Cherrypick a force merge
Fix brig access
Revert "Cherrypick a force merge"
This reverts commit f2c9c5749eaefb29a44dacb2d7032a34867f1333.
GUH
Fix more errors
Update lighthouse.yml
Update lighthouse.yml
Fix tests
Test Moment
fix character editor
remove hyperlink books
2024-07-19 21:15:42 -07:00
VMSolidus
542a7085c4
Rework Mimic as Rampant Brand Intelligence ( #395 )
...
# Description
This PR was originally just going to be me fixing the stupid MobMimic
bug. Over the course of 5 hours, and in a state of sleep deprived
delirium, I somehow expanded this into something resembling the Rampant
Brand Intelligence midround event. You're welcome I guess? I'm going to
go get some sleep.
# TODO
- [x] Re-examine this after at least 9 hours of sleep, and vomit after I
read my own shitcode
- [x] Make it not shitcode
# Changelog
🆑
- add: Rampant Brand Intelligence has been spotted infesting NT
Stations, be on the lookout for highly aggressive vending machines.
---------
Signed-off-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com >
2024-07-18 12:30:00 -07:00
metalgearsloth
d83767e096
Cleanup mimic event ( #23705 )
...
* Cleanup mimic event
Now it won't be forced on dev map or mapping mode.
* Minor cleanup
(cherry picked from commit f0d9782df418d4d4c3b1127a7adfafa5b3ace09c)
2024-01-26 22:11:57 +01:00
