Commit Graph

9281 Commits

Author SHA1 Message Date
SkyratBot
f9d9915277 [MIRROR] Adds a plushie sprite for suit storage (#3482)
* Adds a plushie sprite for suit storage (#56919)

fix: Adds a sprite for plushies in suit storage slots.

* Adds a plushie sprite for suit storage

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-18 19:21:57 +00:00
SkyratBot
89f140c760 [MIRROR] stops people using message all when their pda doesn't allow it (#3489)
* stop people using message all when their pda doesn't allow it (#57005)

Fixes not checking for Send All permissions in Topic.

* stops people using message all when their pda doesn't allow it

Co-authored-by: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
2021-02-18 19:20:12 +00:00
SkyratBot
3b85cf1430 [MIRROR] Addiction rework (#3445)
* Addiction rework

* a

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:26:44 +00:00
SkyratBot
43febe3145 [MIRROR] Converts many proc overrides to properly use list/modifiers, lots of other smaller things (#3433)
* Converts many proc overrides to properly use list/modifiers, lots of other smaller things

* Update human_defense.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-17 14:18:21 +00:00
SkyratBot
c7ee4d2b13 [MIRROR] Plumbing IV drip (#3453)
* Plumbing IV drip (#56920)

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

* Plumbing IV drip

Co-authored-by: Time-Green <timkoster1@hotmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-17 13:43:42 +00:00
YakumoChen
8d20e999ee Yet more special description contraband (#3428)
* mystify radio jammer

* Update emags.dm

* Update emags.dm

* Update toolbox.dm

* syndie duffels

* Update emags.dm
2021-02-17 01:19:51 +00:00
SkyratBot
4b385c1372 [MIRROR] Can no longer immediately return a wayfinding pinpointer for a costume (#3441)
* Can no longer immediately return a wayfinding pinpointer for a costume (#56916)

* Can no longer immediately return a wayfinding pinpointer for a costume

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-17 01:16:25 +00:00
SkyratBot
18f7ed58eb [MIRROR] Removes older ID consoles from the code, and circuitboards (#3284)
* Removes older ID consoles from the code, and circuitboards

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

* a

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-16 12:44:12 +00:00
SkyratBot
63de7b4b0d [MIRROR] Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#3415)
* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included. (#55551)

Converts the effects of the nightmares light eater into a component and a couple elements
Adds some flavor text to the light eater
Makes the effects of the nightmare's light eater dispel if the armblade is destroyed
Probably a net increase in code quality
More flavortext
The nightmare's light eater effect can be dispelled if you are willing to sacrifice the armblade

* Refactors the Light Eater and gives it some flavortext. Some minor behavior changes included.

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2021-02-16 00:45:39 +00:00
Gandalf
c0b99ccfef Coronal Mass Ejection Event (#3280)
* a

* Update cme.dm

* Update _cme_defines.dm

* Update cme.dm

* Update cme.dm

* Update cme.dm

* a

* Update cme.dm

* a

* random!

* TEMP DEBUG STATS, UNDO ONCE READY TO MERGE!

* a

* Update cme.dm

* better sfx

* Update cme.dm

* Update cme.dm

* Update cme.dm

* Neutralize!

* Update cme.dm

* Update cme.dm

* a

* Update cme.dm

* Update cme.dm

* Update cme.dm

* CME changes

* Update anomaly_neutralizer.dm

* aa

* Update cme.dm

* a

* Update admin_verbs.dm

* Fix gamma loop

* Update cme.dm

* Update set_security_level.dm

* Update code/controllers/subsystem/events.dm
2021-02-15 20:18:57 +00:00
Elli-Skala
888e223d69 makes bone spears have reach of two (#3383)
* Update spear.dm

* Update spear.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-02-15 19:51:50 +00:00
SkyratBot
0cf8d6a649 [MIRROR] Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#3403)
* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols (#56754)

* Gives the sniper rifle a suppressor overlay so that it no longer shows up as missing a sprite, also fixes donksoft pistols by repathing them from pistols over repathing them from toy saber smgs. Creates a flag for checking if a gun needs a toy overlay, so it is handled in the parent.

* Sprite fixes: Suppressed Sniper Rifles and Donksoft Pistols

* Update maint_loot_common.dm

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 17:48:59 +00:00
SkyratBot
ef6df1167f [MIRROR] Portable chem mixer: Integration of fermichem and minor updates to usability (#3402)
* Portable chem mixer: Integration of fermichem and minor updates to usability (#56894)

- The portable chem mixer now displays pH-values
- It can now dispense 1u of reagents, so buffer solutions can be added carefully
- It can now be loaded with bottles, plastic bottles and condiment bottles (all bottle types that the chem masters/chemistry can make). Beakers also still work of course.
- CTRL+click opens and closes it to switch between filling mode (inventory in which you place beakers and bottles) and dispensing mode (UI in which you dispense to a container)
- When worn on the belt and in filling mode, a left click opens its inventory. No more dragging or alt-clicking needed to open it. (alt-clicking to swap beakers in dispense mode still works, just like the normal dispensers)
- The UI has been resized to, in its default state, make it easier to visually skim through the chemicals in the list

* Portable chem mixer: Integration of fermichem and minor updates to usability

Co-authored-by: LordVollkorn <66637090+LordVollkorn@users.noreply.github.com>
2021-02-15 15:33:48 +00:00
SkyratBot
b332b46b65 [MIRROR] Remove hideous inline tab indentation, and bans it in contributing guidelines (#3394)
* Remove hideous inline tab indentation, and bans it in contributing guidelines

* a

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-15 15:32:02 +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
c5779d4c16 [MIRROR] lowers the size of torches, and lets them be made with leafy mushrooms (#3379)
* lowers the size of torches, and lets them be made with leafy mushrooms  (#56877)

* lowers the size of torches, and lets them be made with leafy mushrooms

Co-authored-by: Elli-Skala <69182855+Elli-Skala@users.noreply.github.com>
2021-02-14 10:23:25 +00:00
SkyratBot
1ceb3c3143 [MIRROR] RCDs now use right click to deconstruct (#3377)
* RCDs now use right click to deconstruct (#56864)

RCDs use right click to deconstruct, everything else is functionally the same. The RCD defines also aren't bitflags anymore, they didn't seem to have any reason to be in the first place.

* RCDs now use right click to deconstruct

Co-authored-by: TJatPBnJ <69724863+TJatPBnJ@users.noreply.github.com>
2021-02-14 10:23:03 +00:00
SkyratBot
35416cafb3 [MIRROR] Makes the spy bug pocket protector a suit accessory (#3376)
* Makes the spy bug pocket protector a suit accessory (#56883)

* Makes the spy bug pocket protector a suit accessory

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-14 10:13:09 +00:00
SkyratBot
be1e6ae01d [MIRROR] Gives wizard constructs a purple theme. Minor construct fixes. (#3361)
* Gives wizard constructs a purple theme. Minor construct fixes.  (#56758)

* Gives wizard constructs a purple theme. Minor construct fixes.

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
2021-02-13 23:21:05 +00:00
SkyratBot
495b35a679 [MIRROR] Converts all uses of modifiers to lazy access to avoid memes in future (#3331)
* Converts all uses of modifiers to lazy access to avoid memes in future

* Update work_tools.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com>
2021-02-13 11:06:39 +00:00
SkyratBot
c21ac8c176 [MIRROR] Fixes bullying socially anxious dead people by blowing kisses at their corpse (#3346)
* Fixes bullying socially anxious dead people by blowing kisses at their corpse (#56732)

At the end of #56698 I added interactions for people with the social anxiety quirk so they sometimes get flustered when hit by a kiss, but I realized precisely 0.2 seconds too late that I didn't actually check if they were alive or conscious before doing so.

This PR fixes this so those reactions will only happen if they're conscious or in soft crit. I also changed the description of the kiss of death lipstick, cause I forgot to put one

* Fixes bullying socially anxious dead people by blowing kisses at their corpse

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-02-13 10:13:58 +00:00
SkyratBot
c430e11d0b [MIRROR] Fixes tags on ordered pizza (#3344)
* Fixes tags on ordered pizza (#56369)

Box tags

    Fixes bug where box tags weren't updating correctly on creation
    Adds box tag flavours for the pizzas without them (i.e. Donk Pocket -> Bangin' Donk, Dank -> Fresh Herb, Sassysage -> Sausage Lovers, Arnold -> 9mm Pepperoni)

Randomised pizza crates

    Pizza crates can now come with any five pizzas, weighted by disruptiveness
    Small chance of getting one pizza bomb in a pizza crate (either armed or not) per shift

Armed pizza bomb

    Adds an armed variant of the bomb pizza box, which has the boxtag "Meat Explosion", contains a meat pizza and explodes 5 seconds after opening
    Makes the pizza party spawner use the armed bomb pizza box, instead of giving whoever a free syndicate pizza bomb they probably aren't allowed to use anyway

Secure kitchen crate

    Adds the secure kitchen crate from my previous PR
    Adds a secure pizza crate variant to KiloStation's cargo warehouse where the freezer crate was, which contains the pizza party and is locked with kitchen access

Ghost examines

    Adds ghost examine messages for pizza boxes with bombs or the nanomachine pizza in them

* Fixes tags on ordered pizza

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-13 10:13:43 +00:00
KathrinBailey
1c17fb7dfb Prison Wars Episode 6: Return of the Genpop (#3322)
* Adjusts miner and prisoner slots

* Update landmarks.dm

* Oh yeah, borg slots.

* Merge branch 'master' into Shafts-uwu

* Genpop

* IDs say hi once sentence is up

* azzu wazzu helps linters

* wazzu

azzu!

* Update turnstile.dm

* Update turnstile.dm

* Update turnstile.dm

* the dme!

* Stops you shooting through turnstiles

You can still cross into them though. You just can't yeet stuff through them.
2021-02-13 02:34:13 +01:00
SkyratBot
bff6b2e317 [MIRROR] Makes n2o nontoxic, for reasons (#3321)
* Makes n2o nontoxic, for reasons (#56839)

Counter to the original intent of the change seen here #50126, n2o will currently deal damage when used with both internal tanks and floods, as the threshold picked for it was about 0.15 moles at room temperature. Even outside this oversight, the original goal can't easily be achieved. Because breathing works off partial pressures, anything you can do with an anesthetic can you can do with an n2o flood.

Therefore I don't think it's behavior worth keeping, as even as a way to disincentivize non-antag n2o floods it would do little.

* Makes n2o nontoxic, for reasons

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-12 12:52:34 +00:00
SkyratBot
7da4aa9adf [MIRROR] Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg. (#3306)
* Reaction rates, pH, purity and more! Brings a heavily improved, less explosive and optimised fermichem to tg.

* a

Co-authored-by: Thalpy <33956696+Thalpy@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-12 00:04:39 +00:00
SkyratBot
8007eb1578 [MIRROR] Refactors sharpness to use a bitfield (#3301)
* Refactors sharpness to use a bitfield (#56817)

Refactors sharpness to use bitfield instead of bitflags in case someone wants to add more types of sharp things, or unique behaviour with them

* Refactors sharpness to use a bitfield

* Update bullets.dm

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-11 23:57:06 +00:00
SkyratBot
b902f89062 [MIRROR] Refactor can_inject, and introduce try_inject (#3300)
* Refactor can_inject, and introduce try_inject (#56816)

Splits can_inject into can_inject and try_inject. The latter can perform side effects, while the former cannot. Moved the show_error bool parameter to a flag that try_inject checks.

Changes the signature to can_inject(mob/user, target_zone, injection_flags). This was previously redefined in several places, making it impossible to use named parameters. This refactor now allows named parameters to be used, and thus avoiding the ugliness of TRUE, FALSE, FALSE in parameters.

* Refactor can_inject, and introduce try_inject

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-11 19:49:47 +00:00
SkyratBot
dc76c98db2 [MIRROR] Changes to Regal Rats (#3253)
* Changes to Regal Rats (#56145)

Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Paul, Sendroiu <AA2792@ student.jamk.fi>

* Changes to Regal Rats

Co-authored-by: eeSPee <robotdevilinside@gmail.com>
Co-authored-by: Qustinnus <Floydje123@ hotmail.com>
Co-authored-by: Paul, Sendroiu <AA2792@ student.jamk.fi>
2021-02-10 11:55:43 +00:00
SkyratBot
e33adb614d [MIRROR] Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#3262)
* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles. (#56696)

* Updates Bronze to be a lot better, fixes bugs and allows it to be used on grilles.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2021-02-10 11:55:12 +00:00
SkyratBot
a1e3b6ffe2 [MIRROR] Chemical scan is now on right click, removes it as a toggle (#3257)
* Change health analyzer, chemical scan is now on right click (#56779)

Health analyzer is now left click for health (or wounds, if you toggle
it) and right click for chemical scans.

Ever since the tgchat combine-previous-chats-in-one thing, knowing what
mode you're on has been a pain for me, as well as needing to cycle
through all of them. Furthermore, this is just a sane right-click
action to have.

* Chemical scan is now on right click, removes it as a toggle

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-10 11:44:55 +00:00
SkyratBot
ce35faea0a [MIRROR] Fixes some missing sprites for the moonlight greatsword and whip and worn bottles, adds new wizard ritual knife sprites (#3248)
* Fixes some missing sprites for the moonlight greatsword and whip and worn bottles, adds new wizard ritual knife sprites (#56737)

fix: Fixes some missing sprites for the Possessed Sword, Moonlight Greatsword and Chain Whip nullrods.
imageadd: Adds new sprites to the wizard ritual knife and veilrenders.

* Fixes some missing sprites for the moonlight greatsword and whip and worn bottles, adds new wizard ritual knife sprites

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-10 00:42:35 +00:00
SkyratBot
e3c1100920 [MIRROR] Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary (#3242)
* Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary (#56700)

Refactors hand tele code with better variable names, splitting procs, fixing C&P code, etc.
Adds pre_attack_secondary, the right click version of pre_attack.
Adds a new alternate function to hand teles, which will reopen the last location you opened. Works based off locations, not turfs. For example, right clicking after locking in "None (Dangerous)" will not teleport you to the same place.

* Add locking into portals with right click on hand tele, refactor hand tele code, add pre_attack_secondary

Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
2021-02-09 19:44:07 +00:00
SkyratBot
b450304a51 [MIRROR] In-spect scanner tweaks (#3225)
* In-spect scanner tweaks (#56720)

* Spellchecks the in-spect scanner description

- Renames it the N-spect scanner
- Changes the sound effect from the quaint voiced placeholder to something I found on Freesound
- Changes the report to be a piece of paper
- Adds encrypted WGW protocol report to paper

* In-spect scanner tweaks

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
2021-02-09 09:46:58 +00:00
SkyratBot
ac54e1f38f [MIRROR] Engineering ERT members get power tools (#3214)
* Engineering ERT members get power tools (#56589)

Engi ERT now get power tools, upgraded RCDs, and a rapid pipe dispenser.

* Engineering ERT members get power tools

Co-authored-by: NotRanged <rangedvdk@gmail.com>
2021-02-08 23:49:29 +00:00
SkyratBot
c0e36814ca [MIRROR] Add missing newline in circuit board definitions (#3207)
* Add missing newline in circuit board definitions (#56745)

Two of the type definitions did not have a newline separating them.

* Add missing newline in circuit board definitions

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:47:46 +00:00
SkyratBot
23fb763667 [MIRROR] Add sound effect to deathrattle implant (#3189)
* Add sound effect to deathrattle implant (#56702)

Sounds are from https://freesound.org/people/gsb1039/sounds/415061/
which is licensed under CC0 (public domain)

Some people said it was too easy to miss the message in the storm of stuff that's going on as a nuclear operative, so now there's a new distinctive sound to announce that you've lost a teammate.

    Also added a missing SIGNAL_HANDLER to a signal handling proc.

* Add sound effect to deathrattle implant

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:42:01 +00:00
SkyratBot
53df094bab [MIRROR] Add pAI internal GPS to possible software (#3184)
* Add pAI internal GPS to possible software (#56404)

pAIs are now a useful space travelling companion, they can help you
navigate if lost (although only the pAI has the GPS view, so they'll
need to communicate the information). If you're holding a GPS, then the
pAI can find you even if you get separated.

* Add pAI internal GPS to possible software

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:38:53 +00:00
SkyratBot
cc9ef500c7 [MIRROR] repaths plasteel tiles to iron (#3155)
* repaths plasteel tiles to iron

* Update robot_modules.dm

* a

* fuck me

Co-authored-by: Fikou <piotrbryla@onet.pl>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:29:36 +00:00
SkyratBot
cc67a133e5 [MIRROR] [READY] Adds station traits: Small modifiers that can randomly be chosen each round (#3132)
* [READY] Adds station traits: Small modifiers that can randomly be chosen each round

* conflicts

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 23:07:24 +00:00
SkyratBot
731a995bcf [MIRROR] Improves Kissing (#3167)
* Improves Kissing (#56698)

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

* Improves Kissing

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
2021-02-07 09:41:24 +00:00
Cameron!
5021730c76 Reverts changes to some traitor items (#3146) 2021-02-06 19:02:21 +00:00
YakumoChen
b9a04aa1ef More stealth descriptions (#3138)
* Update special.dm

* sr edit

* EMP flashlight

* stealthier flash

* syndie health analyzer

* thermals

* grammar
2021-02-06 14:48:52 +00:00
MLGTASTICa
c344beff58 Adds special descs to chameleon items , energy swords(toy and real) , chameleon projector , implanters. (#3136)
* the descs

* Update chameleonproj.dm

* Update dualsaber.dm

* Update implant_misc.dm

* Update energy.dm

* Update toys.dm

* Update toys.dm

* Update chameleon.dm

* Update pen.dm

* grammar

* Update implantuplink.dm

* Update implant_stealth.dm

* Update energy.dm

* Update chameleon.dm

* Update pen.dm

Co-authored-by: MLGTASTICa <ak9bc01d@yahoo.com>
2021-02-06 14:46:43 +00:00
SkyratBot
c496fc41ab [MIRROR] Various crew tracking fixes (#3137)
* Various crew tracking fixes (#56591)

Nanite Monitoring program now makes people trackable as if they have enabled their suit sensors, as stated in the program description.

Now you can track people with Nanites Monitoring program using following devices:

    Crew pinpointer (arrow)
    Crew pinpointer - contractor version (arrow)
    Crew pinpointer (proximity)
    Lifeline radar (modular computers software)

Also fixed multi-Z tracking for the first three devices. When the target is on different Z of the same station, it shows "?" icon.

Also, the stationary crew monitor will now work properly on multi-Z stations.

* Various crew tracking fixes

Co-authored-by: Andrew <mt.forspam@gmail.com>
2021-02-06 14:27:21 +00:00
SkyratBot
2013fdbbe9 [MIRROR] Makes borg organ bags into an apparatus (#3106)
* Makes borg organ bags into an apparatus

* Update robot_modules.dm

* Update highlander.dm

* Update highlander.dm

* Update robot_modules.dm

* Update robot_modules.dm

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

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 22:21:36 +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
23da06b23b [MIRROR] Remove adrenal implant and associated reagent (#3121)
* Remove adrenal implant and associated reagent (#56649)

* Remove adrenal implant and associated reagent

Co-authored-by: skoglol <33292112+kriskog@users.noreply.github.com>
2021-02-05 22:06:32 +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
SkyratBot
3c37bdc8e5 [MIRROR] disables godmode for some vendors and adds missing refills (#3103)
* disables godmode for some vendors and adds missing refills (#56570)

* disables godmode for some vendors and adds missing refills

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-05 21:24:37 +00:00
SkyratBot
e124662031 [MIRROR] A Big Hydroponics Update: A Rose by any other name (2 new plants, 4 new traits, new genes, and more!) (#3089)
* A Big Hydroponics Update: A Rose by any other name (2 new plants, 4 new traits, new genes, and more!)

* Update grafts.dm

* Update grafts.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-05 21:13:02 +00:00