Commit Graph

707 Commits

Author SHA1 Message Date
SkyratBot
c765afc23d [MIRROR] Chef Produce Console, for cases where there are no botanists (#3786)
* Chef Produce Console, for cases where there are no botanists (#57298)

* Chef Produce Console, for cases where there are no botanists

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-03-03 03:42:00 +00:00
SkyratBot
a05f7e863a [MIRROR] Fully implements the ID Card design document (#3729)
* Fully implements the ID Card design document

* Oh fuck that hurt.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-03-03 01:54:25 +00:00
SkyratBot
f5083f498b [MIRROR] *smacks table* Hot Damn! (#3734)
* *smacks table* Hot Damn! (#57269)

* *smacks table* Hot Damn!

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-01 17:49:38 +00:00
SkyratBot
18eca27569 [MIRROR] update_appearance (#3508)
* update_appearance

* a

* a

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-19 16:08:09 +00:00
SkyratBot
9e07263fdf [MIRROR] Improves crafting code a tiny bit (#3477)
* Improves crafting code a tiny bit (#56937)

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

* Improves crafting code a tiny bit

* a

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-18 20:59:11 +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
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
6942c57658 [MIRROR] Adds GPS to bounty cubes (#3386)
* Adds GPS to bounty cubes (#56838)

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

* Adds GPS to bounty cubes

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-02-14 10:25:42 +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
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
SkyratBot
7b326654b3 [MIRROR] Cargo bounty cube incentives (#3263)
* Cargo bounty cube incentives (#56375)

Bounty cube announces its creation over Supply with its creator and
area, starting the speedy delivery bonus countdown
20% bonus for cargo if you send the cube within 5 minutes of its
creation.

Using an export scanner on it in the supply shuttle awards a 10%
personal handling tip when it reaches Centcom.

Cube nags at five minutes over Supply if it's not sent and cargo bonus
is lost.

All nags tell you the cube's area

Co-authored-by: coiax <yellowbounder@ gmail.com>

* Cargo bounty cube incentives

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
2021-02-10 11:55:27 +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
8b17ebd2ad [MIRROR] Add the ability to buy space heaters from cargo (#3208)
* Add the ability to buy space heaters from cargo (#56743)

With recent atmospheric changes having a greater affect on the station's
temperature, it makes sense for heating/cooling equipment to be as
purchasable by cargo as existing scrubbers and air pumps.

In addition, were all those heaters in maintenance hand assembled on the
station, or shipped in?

* Add the ability to buy space heaters from cargo

Co-authored-by: coiax <yellowbounder@gmail.com>
2021-02-08 23:48:03 +00:00
SkyratBot
c28056f519 [MIRROR] fixes the LAST missing refill (#3186)
* fix missing detdrobe refill is orderable (#56716)

* fixes the LAST missing refill

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-02-08 23:39:29 +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
e83e1b7d41 Standardizes area paths and area-based nomenclature (#3125)
Co-authored-by: Son-of-Space <63861499+Son-of-Space@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-08 22:59:05 +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
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
SkyratBot
f4fd38b1a8 [MIRROR] Aquarium fish improvements (#3069)
* Aquarium fish improvements (#56573)

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

* Aquarium fish improvements

* Update mapping_helpers.dm

* Update packs.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: coiax <yellowbounder@ gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-04 19:36:20 +00:00
Gandalf
db677186eb Lopland Security and Armadyne Weaponry rework [Security Medic and Sergeant] [RFT] (#2860)
* REMOVE BATONG

* Stage 2 emitters

* aaa

* aaaa

* Climb up and start the rotors

* the DOORS MASON

* Stage 3 emitters

* a

* a

* Update belt.dm

* aaaa

* more clothes

* update, wintercoat!

* Update wardrobes.dm

* Update wardrobes.dm

* test

* Better

* STAGE-4 BOIS

* No wait, it's stage 5

* aaa

* gunsets and tokens!

* hot backend stuff

* Fixes

* aaa

* QUICKDRAW!

* The smartgun

* a

* a

* a

* Map changes

* a

* Merge branch 'master' into thesecining

* Merge branch 'master' into thesecining

* PHASE 6 LADS, IT'S DONE!

* Merge branch 'master' into thesecining

* smartgun delay

* New HUD and ID cards + EMP protection system

* Create readme.md

* flashlight

* clof

* Update master.dm

* 6.5

* armadyne

* SECURITY SERGEANT AND MANY TWEAKS

* Update security.dm

* a

* Update jobs.txt

* Update security_sergeant.dm

* Report to!

* Update guns.dm

* Merge branch 'master' into thesecining

* redesign

* Update MetaStation_skyrat.dmm

* Update KiloStation_skyrat.dmm

* Update decals.dm

* It's nearly done lads.

* corpo

* a

* Update ammo.dm

* a

* Update bullets.dm

* fuxes

* Update shields.dm

* a

* Update guns.dm

* Bullet drive + fixes

* Update gunsets.dm

* Update bulletdrive.dmi

* Update hud.dmi

* fix

* fs

* a

* .

* Update bullets.dm

* aaa

* Update bullets.dm

* Update tgstation.dme

* bulletbot

* Update bulletbot.dm

* a

* oops

* fixes

* aaaa

* Update vending.dmi

* a

* seclock

* aaa

* a

* a

* a

* Update ammoboxes.dmi

* fixesa

* a

* Update guns.dm

* a

* Update guns.dm

* Peacekeeper hardsuit

* a

* a

* aaa

* Update peacekeeper_clothing.dm

* couple fixes

* Merge branch 'master' into thesecining

* hitscan laser gun

* a

* Merge branch 'master' into thesecining

* a

* a
2021-02-04 16:38:48 +00:00
SkyratBot
70024ef6ad [MIRROR] Reverts Adds Neon Carpet (#55782) (#3040)
* reverts Adds Neon Carpet (#55782), it appears to have been causing massive amounts of maptick (#56496)

It appears to have been causing massive amounts of maptick, this'll need a testmerge so we can test my hypothesis

* Reverts Adds Neon Carpet (#55782)

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-02-03 10:22:43 +01:00
SkyratBot
e0727dd6a4 [MIRROR] fixes various grammar issues (#2935)
* fixes various grammar issues (#56446)

fixes misspellings of 'permanently'
fixes grammar with bandaging wounds on yourself

* fixes various grammar issues

Co-authored-by: elle <54373583+dermondarble@users.noreply.github.com>
2021-01-29 12:06:57 +00:00
SkyratBot
3000d75ad5 Adds aquariums and aquarium fish. (#56343) (#2920)
Co-authored-by: tralezab <spamqetuo2@gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: coiax <yellowbounder@gmail.com>

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: tralezab <spamqetuo2@gmail.com>
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: coiax <yellowbounder@gmail.com>
2021-01-28 03:27:25 +01:00
SkyratBot
902f0a06d7 [MIRROR] Adds Neon Carpet (#2882)
* Adds Neon Carpet

* HARDSET

* Update tgstation.dme

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 17:01:58 +00:00
SkyratBot
d581ef7a4b [MIRROR] The day has come gamers, the mosin nerf/rework (#2883)
* The day has come gamers, the mosin nerf/rework (#56319)

* THE NERF

* fixes a dumb mistake

* Sanity check and second thoughts

* mosin jamming

* adds the cleaning supplies, sprites, slight changes to dmg and jamming and HNNNG ONE LAST BUG

* adds maint kit to russian surplus, second try at fixing

* everything is fixed now :)

* finishing touches

* Last fix?

* fix

* fix var names

* a new sound and few more fixes

* add /brand_new variant to all ert/special spawned mosins, added a check if bolt is locked

* Bolt_locked is true when bolt is open 😂

* added a clamp just in case

Co-authored-by: Sparkezel <1haslo4@ gmail.com>

* The day has come gamers, the mosin nerf/rework

* Update to use our realism

Co-authored-by: Sparkezel <53384660+Sparkezel@users.noreply.github.com>
Co-authored-by: Sparkezel <1haslo4@ gmail.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-01-25 16:17:46 +00:00
SkyratBot
7402ba86a8 [MIRROR] Adds database tracking to maintenance pills (#2747)
* Adds database tracking to maintenance pills (#56179)

I originally added maintenance pills, and while already perfect, I felt like polishing them a bit. I didn't do much, just:

- Maintenance pills now track a players score. Gotta eat em all to get that leaderboard highscore!
- More names and decriptions for maintenance pills, most of them suggestions from the old PR
- Renamed floorpill to pill/maintenance in code because that's what they are, no idea why I didn't originally do it

I've also polished the sprite a little bit, because it always looked a bit _too_ shady
![image](https://user-images.githubusercontent.com/7501474/104741899-19624880-574a-11eb-8211-65d89d8d36c4.png)
(Below is old sprite, above is new sprite)

* Adds database tracking to maintenance pills

Co-authored-by: Time-Green <timkoster1@hotmail.com>
2021-01-17 13:39:53 +01:00
SkyratBot
c8dba42a4c [MIRROR] tweaks lrtbbq blackmarket thing cooldown timers (#2746)
* tweaks lrtbbq blackmarket thing cooldown timers (#56176)

when i asked chosen a while back why is this thing so slow he said he did math wrong as proof on comment in line 54: tier 4 was 120 instead of 20 processing ticks aka 60s instead of 10s
he probably forgot about it so i ll pr it myself

* tweaks lrtbbq blackmarket thing cooldown timers

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2021-01-17 13:39:19 +01:00
SkyratBot
65203afb46 [MIRROR] Infinite Gun Culling: Gun Kit Edition (#2727)
* Infinite Gun Culling: Gun Kit Edition (#56133)

Every prototype firearm in the game now utilizes crafting to construct it, usually sacrificing a standard version of that firearm in order to produce the new one. The guns are made using gun part kits you print from the security protolathe (or buy, in the case of hellfire lasers).

* Infinite Gun Culling: Gun Kit Edition

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-01-17 13:30:43 +01:00
SkyratBot
94f9a384b0 [MIRROR] [READY] Bespoke Datum Mats (#2737)
* [READY] Bespoke Datum Mats

* Update sheetifier.dm

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-17 13:25:04 +01:00
SkyratBot
ee2583ed8f [MIRROR] removes cardboard box and supplypod shitcode (#2609)
* improves cardboard box and supplypod code (#56043)

Doesn't let force default to TRUE just in case someone tries to open when they're not supposed to.

* removes cardboard box and supplypod shitcode

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
2021-01-10 08:23:37 +01:00
SkyratBot
6fb8b61651 [MIRROR] Adds a new security bounty and tweaks existing security bounties. (#2601)
* Adds a new security bounty and tweaks existing security bounties. (#55952)

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

* Adds a new security bounty and tweaks existing security bounties.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
2021-01-09 21:18:23 +01:00
MissFox0810
5d5492f7a5 removes some guns and there ammo from cargo goodie (#2494)
* removes some guns and there ammo from cargo goodie

* removed more guns and ammo from goodies

* Removed Mafia Crate

* removed them entirly from skyrat code

* Removed the lines recomended by Azarak

Co-authored-by: MissFox <github@aesir.org.uk>
2021-01-09 04:06:05 +00:00
SkyratBot
7ae85350f3 [MIRROR] Fixes incorrect message displaying in the supply console after exporting metallic hydrogen (#2558)
* Metalic hydrogen export datum now assigns message instead of unit_name (#55990)

Centcom's cargo division no longer calls metallic hydrogen "developer's tears".

* Fixes incorrect message displaying in the supply console after exporting metallic hydrogen

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
2021-01-08 00:39:40 +01:00
Azarak
7a6c5eefa2 Removes meat and pizza materials (#2540) 2021-01-07 21:05:57 +01:00
SkyratBot
c1aca48951 [MIRROR] [Fuck Shotties] Makes shotguns specialist weaponry. (#2321)
* [Fuck Shotties] Makes shotguns specialist weaponry. (#55663)

    Shotgun slugs can no longer be made in an autolathe.
    Buckshot rounds can no longer be made in an autolathe.
    Frag12 rounds deal less direct damage, since they fucking explode.
    Pulse shot rounds deal less damage.
    Increased the cooldown on riot shotguns.
    Removed buckshot rounds from all maps.
    Combat shotguns start with beanbags.

Why It's Good For The Game

Shotguns have been overpowered for too long. NT is lasers , syndicate is ballistics.

* [Fuck Shotties] Makes shotguns specialist weaponry.

Co-authored-by: EdgeLordExe <42111655+EdgeLordExe@users.noreply.github.com>
2020-12-27 15:23:07 +00:00
Zenitheevee
3f9c7ace80 [Mostly-Modular] Expansive Shipping Part 1: Mostly Armaments (#2091)
* Expansive Shipping Pt 1

* price oopsie

* changelog1

* Paycheck and Crate value compliance

* Woopsie, Fixing Hydrohelper being in Packs DM file

* //Skyrat Edit

* //SKYRAT EDIT ADDITIONING
2020-12-25 20:09:37 +00:00
SkyratBot
87930f4ea0 [MIRROR] [READY] Refactors riding (#2307)
* [READY] Refactors riding (#54778)

* [READY] Refactors riding

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2020-12-24 12:38:15 +01:00
SkyratBot
3c9d15268b [MIRROR] Adds hydroponics shrubs, allowing botanists to grow hedges. (#2267)
* Adds hydroponics shrubs, allowing botanists to grow hedges. (#55496)

Replaces one of the rainbow seeds in the exotic seeds crate with a pack of shrub seeds.
Adds a new, growable seed species for shrubs. Shrubs, when planted (similar to kudzu!) plants a solid, weak barrier in hedges.
These hedges block vision, unless trimmed. Thankfully, we already have a hedge trimming skillchip, so using a sharp implement on the hedge will make it non-opaque.

* Adds hydroponics shrubs, allowing botanists to grow hedges.

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
2020-12-21 19:57:21 +00:00
SkyratBot
35aaa84a84 [MIRROR] Filterrific! (#2233)
* Filterrific!

* a

Co-authored-by: Rob Bailey <actioninja@gmail.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-19 06:29:54 +01:00
SkyratBot
6355c9917e [MIRROR] Export scanner doesn't need to link + old bounty code is gone (#2197)
* Export scanner doesn't need to link + old bounty code is gone (#55504)

Removes the Export scanner's need to link with a console and cleans up the old bounty code

* Export scanner doesn't need to link + old bounty code is gone

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
2020-12-17 08:02:12 +01:00
SkyratBot
6603e04fc0 [MIRROR] Crates and bountes are now defined by crate's value and paygrades. Civilian bounty payout is higher and uncheesable. (#2120)
* Crates and bountes are now defined by crate's value and paygrades. Civilian bounty payout is higher and uncheesable.

* Update shuttles.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-12-11 00:50:53 +00:00
SkyratBot
135e659aab [MIRROR] Makes Metalgen Unrecycleable (#2111)
* Makes Metalgen Unrecycleable (#55417)

* Makes Metalgen Unrecycleable

Co-authored-by: TemporalOroboros <TemporalOroboros@gmail.com>
2020-12-10 10:47:01 +00:00
SkyratBot
38c778c9bf [MIRROR] Cargo can now order empty supplypods through the express console (#2052)
* Cargo can now order empty supplypods through the express console (#54215)

* Cargo can now order empty supplypods through the express console

Co-authored-by: Emmanuel S <mrdoomboyo@gmail.com>
2020-12-06 04:12:06 +01:00
SkyratBot
2913364658 [MIRROR] Kills oldfood, Puts newfood on top. (#2041)
* Kills oldfood, Puts newfood on top. (#55160)

Slays the last of old-food, making new-food the new normal.

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

* Kills oldfood, Puts newfood on top.

* Update collars.dm

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: MrMelbert <kmelbert4@ gmail.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-04 16:46:26 +01:00
SkyratBot
c487c73f39 [MIRROR] Grep for space indentation (#1969)
* Grep for space indentation

* aa

* Update species.dm

* Update species.dm

* Update maps.dm

* Update examine.dm

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Azarak <azarak10@gmail.com>
2020-12-01 12:26:41 +01:00
SkyratBot
1a52861db2 [MIRROR] make gas selling use elasticity (#1967)
* make gas selling use elasticity (#55192)

Fix gas selling never use diminishing returns

* make gas selling use elasticity

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2020-11-30 17:27:14 +00:00
SkyratBot
a92fdde30e [MIRROR] Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it (#1904)
* Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it (#55076)

/obj/effect/ex_act had several different re-definitions to make it a noop. The original definition would randomly delete it, which is bad news when a lot of /obj/effects are just that--effects, that shouldn't be blown up.

The ones that actually do want to be blown up (like decals) already have their own implementations. The one in place was never ran, and nobody had problems with it.

* Remove duplicate definitions of /obj/effect/ex_act, explicitly noop it

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@users.noreply.github.com>
2020-11-28 12:59:11 +01:00
SkyratBot
65368300d2 [MIRROR] Refactors Pastries into newfood. (#1824)
* Refactors Pastries into newfood. (#54996)

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

* Refactors Pastries into newfood.

* Update collars.dm

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
Co-authored-by: Floyd <Floydje123@ hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2020-11-25 01:02:00 +00:00