Commit Graph

240 Commits

Author SHA1 Message Date
SkyratBot
5fa25bfc25 [MIRROR] Antagonist Flavor 2: Malfunction Comes in Many Flavors! [MDB IGNORE] (#9753)
* Antagonist Flavor 2: Malfunction Comes in Many Flavors! (#62774)

Malfunctioning Ais now get their own special antagonist panel, and roll for backstories much like traitors! As before, these are simply suggestions to encourage roleplay while you server wipe as the funny box.

* Antagonist Flavor 2: Malfunction Comes in Many Flavors!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-28 14:13:27 -05:00
SkyratBot
de4647c320 [MIRROR] Replaces Batform with Vampire houses [MDB IGNORE] (#9636)
* Replaces Batform with Vampire houses (#62516)

Permissions for species change

image
About The Pull Request

Goodbye batform

Hello, new preference called vampire status. Outcast vampires act just like normal, Inoculated vampires join their department under a unified "vampire house name" everyone shares.

image

image

image
Why It's Good For The Game

I've heard people complain about batform for years now, if vampires aren't gone by next halloween we can at least enjoy making them far less griefy (ruining a lot of the fun of halloween as just a dumb grief holiday) and more roleplay oriented. I don't even know why vampires got a griefy spell when they already have their main mechanic encourage randomly attacking people and stealing their blood to stay alive
Changelog

cl
del: Batform is gone!
add: ...Replaced by vampire houses as a preference. Join your department as a vampire ménage!
/cl

* Replaces Batform with Vampire houses

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-23 04:09:07 +00:00
SkyratBot
1724d3c578 [MIRROR] Traitor Flavor is now displayed on roundend [MDB IGNORE] (#9442)
* Traitor Flavor is now displayed on roundend (#62740)

* Traitor Flavor is now displayed on roundend

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-14 12:03:41 -05:00
SkyratBot
cd3e86ad7d [MIRROR] Champions of Evil + (Plus sorts the traitor flavor json and global lists) [MDB IGNORE] (#9206)
* Champions of Evil + (Plus sorts the traitor flavor json and global lists) (#62429)

Adds a traitor flavor with a new faction, the Champions of Evil. They're hell bent on 1. Evil and 2. Recruiting evildoers. They, uh, kind of larp a lot. No judgements, ok?

Requested and almost got into flavor traitors 1.0, but I dunno what happened but they never made it in. They're suggesting a total classic gimmick: Buy a syndicate headset, meet up with other evildoers, and get shot by them and looted! Which I've been doing and loving since 2015.

* Champions of Evil + (Plus sorts the traitor flavor json and global lists)

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-11-02 23:11:26 +00:00
SkyratBot
227fa82fa9 [MIRROR] SM: Randomly damage/heal on dusting a Clown [MDB IGNORE] (#8894)
* SM: Randomly damage/heal on dusting a Clown (#62178)

When the SM dusts a true Clown (HoP assignment doesn't count), it randomly takes from -300 to 300 damage.

* SM: Randomly damage/heal on dusting a Clown

Co-authored-by: esainane <esainane+github@gmail.com>
2021-10-17 23:15:59 +01:00
SkyratBot
3c20b53bd3 [MIRROR] Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF [MDB IGNORE] (#8659)
* Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF (#61638)

This PR replaces the Mafia button on the observer HUD with a minigames button that allows you to access both CTF and Mafia.

It also adds a CTF menu that allows you to view current scores, players needed to start a game, and joining a ctf game without needing to move to the spawner.

Co-authored-by: Jared-Fogle <35135081+Mothblocks@ users.noreply.github.com>

* Replaces the Mafia button with the Minigames button. Adds tgui panels for selecting minigames and for CTF

Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Mothblocks@ users.noreply.github.com>
2021-10-07 12:55:09 -04:00
SkyratBot
2198024a73 [MIRROR] You can now use backslashes as an escape character for text modification. [MDB IGNORE] (#8438)
* You can now use backslashes as an escape character for text modification.

* Update ticker.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:11:14 +01:00
SkyratBot
374dceddaa [MIRROR] Adds a new achievement and command report for cultists obliterating Centcom's shuttle corps (#8405)
* Adds a new achievement and command report for cultists obliterating Centcom's shuttle corps (#61566)

* Adds a new achievement and command report for cultists obliterating Centcom's shuttle corps

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-09-26 14:26:30 +01:00
SkyratBot
4996ab470f [MIRROR] Nuclear Operatives will now see the nuke codes in memories (#8205)
* Nuclear Operatives will now see the nuke codes in memories (#61448)

This adds the ability for the nuclear operatives to check their memories for the nuke code. Memories are the successor to notes, the latter being where the nuke code was stored before. Many thanks to tralezab for helping me make this change. Also shoutout MrDoomBringer for making the messages suck less

* Nuclear Operatives will now see the nuke codes in memories

Co-authored-by: Burgermancoding <79515258+Burgermancoding@users.noreply.github.com>
2021-09-15 22:49:42 +01:00
SkyratBot
d3d2f85351 [MIRROR] Typo: Truely -> Truly (#8167)
* Typo: Truely -> Truly (#61379)

* Typo: Truely -> Truly

Co-authored-by: esainane <esainane+github@gmail.com>
2021-09-15 03:30:54 +01:00
SkyratBot
8cb46c7597 [MIRROR] Phobia DLC - Spooky Pack (#8101)
* Phobia DLC - Spooky Pack

* Fixing merge conflict

* Fixing linters, again.

Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:46:10 +01:00
SkyratBot
e510e35167 [MIRROR] [READY] Adds memory system, and engraving walls with chisels (#8066)
* [READY] Adds memory system, and engraving walls with chisels

* EEE

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:36:51 +01:00
SkyratBot
3f5dfff58d [MIRROR] Remove remaining references to research point generation through power generation (#8081)
* Remove remaining references to research point generation through power generation (#61294)

Radiation collectors and tesla coils being able to create research points was removed in 92209dd. This stops references to power-based research point generation from appearing.

Research by power is long gone

Restore flavor to power collecting circuitboards
H/T EricZilla

* Remove remaining references to research point generation through power generation

Co-authored-by: esainane <esainane+github@gmail.com>
2021-09-09 22:53:03 -04:00
SkyratBot
36143c77ff [MIRROR] Fixes broken traitor flavor key (#7985)
* Fixes broken traitor flavor key (#61039)

renamed Tiger Cooperative to Tiger Cooperative Fanatic

* Fixes broken traitor flavor key

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-09-05 16:07:20 +01:00
SkyratBot
e8627c29e9 [MIRROR] fixes a dumb issue with traitor flavor AGAIN (#7905)
* fixes a dumb error with traitor flavor AGAIN (#61119)

going postal now uses the correct ui theme and isn't confused with tiger cooperative

* fixes a dumb issue with traitor flavor AGAIN

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-09-01 15:58:29 +01:00
SkyratBot
3564dc138c Add some new posibrain names (#60932) (#7656)
Co-authored-by: oranges <email@oranges.net.nz>
2021-08-20 06:38:51 -04:00
Gandalf
1bb364a193 PREFERENCES RESET [DANGER] (#7414)
* aaa

* aaaa

* Update preferences_setup.dm
2021-08-06 02:02:27 +01:00
SkyratBot
9f7d93f3f3 [MIRROR] Remove nanites (#7210)
* Remove nanites

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-29 00:45:17 +01:00
SkyratBot
2f97e56264 Minor correction to traitor flavor (#7141)
Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-07-26 15:49:23 +01:00
SkyratBot
318563b98f [MIRROR] Adds a name to clown.txt (#6785)
* Update clown.txt (#60018)

* Adds a name to clown.txt

Co-authored-by: AnCopper <82319489+AnCopper@users.noreply.github.com>
2021-07-08 03:03:00 +02:00
SkyratBot
db27081d6a [MIRROR] Removes potential github liability (#6510)
* Removes potential github liability (#59794)

the other two were fine but having this one under `ionthreats` isn't a good look

* Removes potential github liability

Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com>
2021-06-25 12:53:14 +01:00
Funce
6a3a5d170f Revert "Revert Clown Spection and Two Person Mecha (temporarily) (#6182)" (#6183)
This reverts commit 1fd2c0f455.

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-10 08:21:52 +12:00
Funce
1fd2c0f455 Revert Clown Spection and Two Person Mecha (temporarily) (#6182)
* Revert "Adds two clown-spection scanners that print clowncrypted reports  (#59306) (#6176)"

This reverts commit 91e1aa4fe4.

* Revert "Two Person Mecha for Robotics: The Only Real Solution To An Imminent Geometer Summoning 💪  (#59249) (#6177)"

This reverts commit cf2c1ca19d.

Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
2021-06-08 23:05:12 +12:00
SkyratBot
91e1aa4fe4 Adds two clown-spection scanners that print clowncrypted reports (#59306) (#6176)
Alright, update the changelog and body of the PR, and comment here when that's done.
This should be ready for merge then.

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
2021-06-08 14:06:30 +12:00
SkyratBot
47179b4211 [MIRROR] Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content) (#6153)
* Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content) (#59373)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Detaches Anonymous themes and Triple AI from SSTicker (+ more anonymous themes and content)

* Mirror!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-06 11:47:38 +12:00
SkyratBot
c418b139be [MIRROR] Ports Mail From Kiwi Take 2: Arconomy Class Mail (#5172)
* Ports Mail From Kiwi Take 2: Arconomy Class Mail

* Update wardrobes.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:20 +01:00
SkyratBot
ee9a63178e [MIRROR] Adds a phobia of guns (#4851)
* Adds a phobia of guns (#58308)

* Adds a phobia of guns

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-04-12 22:09:06 +01:00
SkyratBot
a3347745a7 [MIRROR] Fermichem 2.5 - Organ(kinda) related medicines adjustments! (#4811)
* Fermichem 2.5 - Organ(kinda) related medicines adjustments! (#57806)

* Initial dump

* Getting there

* Update impure_medicine_reagents.dm

* Update impure_medicine_reagents.dm

* Adds the reaction mechanics

* Compiling fixes

* Update medicine_reagents.dm

* Updates the debug machine to allow for live recipe edits and tweaks the rest of the stuff

* Few fixes and things I missed

* linters

* Feedback changes

* Apply suggestions from code review. Thanks ATH1909!

Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>

* More changes

* Few more tweaks before component and eyes

* Update chem_recipe_debug.dm

* Fixes loop I think

* I guess I'll just have to hope qdel does it's job

* It really doesn't like nullspace

* Fixes bug in oculine and misspelling

* No obsessed traumas to avoid forced antaging

Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>

* Fermichem 2.5 - Organ(kinda) related medicines adjustments!

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
2021-04-11 00:25:59 +01:00
death and coding
3006117250 [modular][ready] kilts, a few other things but A SEC KILT (#4715)
* And most of the football greats Have past through Parkheads gates For to play football the Glasgow Celtic way.

* reading slash porn

* OH GOD

* underground overground swim in the sea

* please work

* i made the sprite unbad, disband the ruc

* as requested, also readded the skeleton of the stunsword

* damn, code no likey, later maybe

* BROWN BOOTS BABY

* cool coat
2021-04-07 14:56:52 +01:00
SkyratBot
7b7e56c1cb [MIRROR] Fixes Tips Message About Ctf To Be Properly Descriptive Of Ctf (#4552)
* Fixes Tips Message About Ctf To Be Properly Descriptive Of Ctf (#58050)

* Fixes Tips Message About Ctf To Be Properly Descriptive Of Ctf

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-03-31 18:23:09 +01:00
SkyratBot
2e54113aae [MIRROR] CTF spawner awareness in tips (#4519)
* CTF spawner awareness in tips (#57995)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* CTF spawner awareness in tips

Co-authored-by: Iosyf <iosyf123456@abv.bg>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-03-29 22:37:22 +01:00
SkyratBot
e379040c41 [MIRROR] Further updates the rounds tips (#4461)
* Further updates the rounds tips (#57951)

Removes and/or updates some more tips that #57927 missed.

* Further updates the rounds tips

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-03-27 19:18:24 +00:00
SkyratBot
49836e4fac [MIRROR] Adds explorer drones / adventures. (#4424)
* Adds explorer drones / adventures.

* Update persistence.dm

* Update asset_list_items.dm

* MAP RESET

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-03-26 15:49:44 +00:00
SkyratBot
6de01c1f88 [MIRROR] Updates round tips (#4392)
* Updates round tips (#57927)

Deals with any mention of cloning, intents, and a few outdated mechanics

* Updates round tips

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
2021-03-25 16:59:10 +00:00
SkyratBot
8e8828937a [MIRROR] Bane AI (#4387)
* Bane AI (#57771)

We take Gotham from the corrupt! The rich! The oppressors of generations who have kept you down with myths of opportunity, and we give it back to you...the people...Gotham is yours. None shall interfere, do as you please!

* Bane AI

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-25 15:27:44 +00:00
SkyratBot
de68dca888 [MIRROR] Rule Botannia: British Bots for the Restaurant (#4280)
* Rule Botannia: British Bots for the Restaurant (#57542)

* I hate moths

they're all dusty and shit

* Rule Botannia: British Bots for the Restaurant

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2021-03-21 01:03:59 +00:00
SkyratBot
024d2ee461 [MIRROR] Incredibly Rare Malfunctioning Customer (#4180)
* Incredibly Rare Malfunctioning Customer (#57537)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>

* Incredibly Rare Malfunctioning Customer

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
2021-03-16 21:47:24 +00:00
SkyratBot
e3b36b1a33 [MIRROR] Moth tourist bots -- They ask for your hat (#4152)
* Moth tourist bots -- They ask for your hat (#57563)

Adds a rare, once per restaurant venue, chance for a moth tourist bot to show up. Asks for the hat, gloves, or shoes you have on.

Closes #57541 if this is merged first, somehow. It includes the testing fix (since I needed to multiply all the weights to allow for rare bots anyway).

Wings are randomized.

I thought it was funny, and it's infrequent enough for the gag to hopefully not lose its magic.

Also a good test bench for the code to allow more dynamic customers. A lot of supporting code was added to make more customizable customers without influencing the surface area of the venue code too much.

Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>

* Moth tourist bots -- They ask for your hat

* Update _customer.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-15 20:48:31 +00:00
SkyratBot
42e7eba82b [MIRROR] Adds an Ocky icky phobia (#3996)
* Adds an Ocky icky phobia (#57450)

Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: interestingusernam3 <51925758+interestingusernam3@ users.noreply.github.com>

* Adds an Ocky icky phobia

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: interestingusernam3 <51925758+interestingusernam3@ users.noreply.github.com>
2021-03-08 07:41:27 +00:00
SkyratBot
c0067da3ab [MIRROR] Adds Mexican tourists to the restaurant system, plus some QOL tweaks. (#3969)
* Adds Mexican tourists to the restaurant system, plus some QOL tweaks. (#57447)

Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>

* Adds Mexican tourists to the restaurant system, plus some QOL tweaks.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@ users.noreply.github.com>
2021-03-07 01:55:37 +00:00
SkyratBot
a54824a776 [MIRROR] Improves Chav to be more chav (#3923)
* Improves Chav to be more chav (#57444)

* Improves Chav to be more chav

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-03-06 19:46:26 +00:00
SkyratBot
ac89e30e5b [MIRROR] Japanese Tourists! Oh, and beef stroganoff, I guess! (#3782)
* Japanese Tourists! Oh, and beef stroganoff, I guess! (#57305)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>

* Japanese Tourists! Oh, and beef stroganoff, I guess!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Jordan Brown <Cyberboss@ users.noreply.github.com>
2021-03-03 02:02:34 +00:00
SkyratBot
35683a3726 [MIRROR] Fixes warden hat leaving a space before message when in Canadian mode (#3700)
* Fixes warden hat leaving a space before message when in Canadian mode (#57190)

* Fixes warden hat leaving a space before message when in Canadian mode

Co-authored-by: Burgermancoding <79515258+Burgermancoding@users.noreply.github.com>
2021-02-27 22:43:57 +00:00
SkyratBot
4770eca75e [MIRROR] Adds tourist robots that order food and drinks from the bar and cafeteria (#3651)
* Adds tourist robots that order food and drinks from the bar and cafeteria (#57010)

* Adds Tourism Economy

Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Adds tourist robots that order food and drinks from the bar and cafeteria

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Emmanuel S. <emmanuelssr@ gmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-27 09:19:00 +00:00
SkyratBot
4e95536827 [MIRROR] Wiz-Off: An Arcane Battle for the Fate of the Universe! (#3589)
* Add Wiz-Off: An Arcane Battle for the Fate of the Universe! (#56980)

Adds Wiz-Off, a new and extremely simple card game to the Fun Vendor.

* Wiz-Off: An Arcane Battle for the Fate of the Universe!

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2021-02-22 12:08:31 +00:00
SkyratBot
7885d5f927 [MIRROR] More CAS cards. (#3550)
* More CAS cards. (#56998)

Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* More CAS cards.

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-20 23:43:39 +00:00
SkyratBot
a765e5b0db [MIRROR] Pirates are split into three different ghastly crews! (#3395)
* Pirates are split into three different ghastly crews! (#56264)

Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>

* Pirates are split into three different ghastly crews!

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: DeAndre <robustness13@ hotmail.com>
Co-authored-by: itseasytosee <55666666+itseasytosee@ users.noreply.github.com>
Co-authored-by: tgstation-server <tgstation-server@ tgstation13.org>
Co-authored-by: Aleksej Komarov <stylemistake@ gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-15 13:32:35 +00:00
SkyratBot
dde88c87bb [MIRROR] people with conspiracy phobias are scared of gas miners (#3312)
* people with conspiracy phobias are scared of gas miners (#56834)

WHERE IS THE GAS GIANT KOWALSKI?

* people with conspiracy phobias are scared of gas miners

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-02-12 10:54:14 +00:00
SkyratBot
699cd1e412 [MIRROR] renames metal sheets to iron sheets (#3116)
* renames metal sheets to iron sheets

* Merge branch 'master' into upstream-merge-56643

* yay metal

* Update DeltaStation2_skyrat.dmm

* a

* Update CentCom_skyrat_z2.dmm

* a

* a

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:09:50 +00:00
SkyratBot
25df6e7da3 Cleaning up robot code: modules renamed to models & DOGBORG REWORK (#2837)
* Cleaning up robot code: modules renamed to models

* Merge branch 'master' into upstream-merge-56312

* [PR Fix] Modular_Skyrat borgos (#3019)

* No more linter complaining

* Halfway (or full way, I don't know) through moving stuff around

* Caps!

* a

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-02-05 21:28:06 +00:00