Commit Graph

151 Commits

Author SHA1 Message Date
SkyratBot
d321c1b652 [MIRROR] Fixes donk pocket box description, big microwave in shambles. [MDB IGNORE] (#14328)
* Fixes donk pocket box description, big microwave in shambles. (#67759)

* Donk Co. Exposed

donk pocket boxes no longer lie, big microwave is in shambles

* Update code/game/objects/items/storage/boxes.dm

Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>

* Fixes donk pocket box description, big microwave in shambles.

Co-authored-by: alphanerdd <60521518+alphanerdd@users.noreply.github.com>
Co-authored-by: ShizCalev <ShizCalev@ users.noreply.github.com>
2022-06-15 12:17:13 +01:00
SkyratBot
7bdf22cf01 [MIRROR] Allows regal rats to heal by eating all types of cheese [MDB IGNORE] (#14281)
* Allows regal rats to heal by eating all types of cheese (#67680)

Co-authored-by: robbertapir <robbertapir@ airmail.cc>

* Allows regal rats to heal by eating all types of cheese

Co-authored-by: robbertapir <102324362+robbertapir@users.noreply.github.com>
Co-authored-by: robbertapir <robbertapir@ airmail.cc>
2022-06-13 06:34:50 -07:00
SkyratBot
1eb891cabb [MIRROR] The Great Species Food Rebalance, Part One: Nutriment, Chemical Recipes, Cargo Orders, Baking Times, Oh My! [MDB IGNORE] (#14100)
* The Great Species Food Rebalance, Part One: Nutriment, Chemical Recipes, Cargo Orders, Baking Times, Oh My! (#67227)

the great rebalance, part one

A comprehensive rebalance of food, including cooking times, nutriment values, crafting recipes, and cargo orders

* The Great Species Food Rebalance, Part One: Nutriment, Chemical Recipes, Cargo Orders, Baking Times, Oh My!

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2022-06-06 00:04:57 +01:00
SkyratBot
81db26ba94 [MIRROR] [MDB IGNORE] Removes tablet cartridges + reworks a ton more [MDB IGNORE] (#13539)
* [MDB IGNORE] Removes tablet cartridges + reworks a ton more (#66505)

- All tablets who previously had apps in a cartridge now has them built-into their tablet instead. This means it costs space for it.
- Rebalances the sizes of several apps to help them fit on Command tablets (Cargo ordering costed 20!!)
- Removes tablet cartridges, they've been reworked into a regular old portable disk (the same you use for toxins/borgs)
- Removes Signaller (the module required to run the signaller app) from tablets (likely will remove more in the future)
- Refactors the health/chem scanning app to not be as bad
- Dehardcodes detomatix resistance
- Ability to send PDA's to all is now tied to your access rather than a cartridge
- Moves 'eject disk' button to the very top of the UI

* [MDB IGNORE] Removes tablet cartridges + reworks a ton more

* wew

* wew

* ok

* Update nanotrasen_consultant.dm

* Update nanotrasen_consultant.dm

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-05-11 22:40:06 +01:00
SkyratBot
044d75253c [MIRROR] Arconomy: The bigger balance PR (REVISED EDITION) [MDB IGNORE] (#13164)
* Arconomy: The bigger balance PR (REVISED EDITION)

* yes

* wew

* Update multitool.dm

* yers

Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
2022-04-27 21:29:22 +01:00
magatsuchi
dc8adc2924 Modular Tablets: Converting PDAs to the NtOS System (SKYRAT VERSION) (#12920)
* hot-patch 1

* hot patch 2

* hot patch 3

* slight issue
2022-04-20 16:55:49 +01:00
Zonespace
1118b4175a Adds a bunch of PRs that the Mirror bot missed (#12535)
* aaAAA

* fix-maps
2022-04-06 17:50:47 +01:00
SkyratBot
17e4f6ad76 [MIRROR] Converts SFX keys into DEFINES [MDB IGNORE] (#11990)
* Converts SFX keys into DEFINES

* fixes and updates

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
2022-03-11 16:43:39 -07:00
SkyratBot
ddfc30c89c [MIRROR] Adds Moth Fashion [MDB IGNORE] (#11612)
* Adds Moth Fashion

* skyrat fix

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
2022-02-20 21:10:39 +00:00
SkyratBot
7c2e83bfc3 [MIRROR] Adds a sprite for rubbershot and the rubbershot box [MDB IGNORE] (#11387)
* Adds a sprite for rubbershot and the rubbershot box (#64562)

Gives rubbershot and rubbershot boxes a new sprite to differentiate them from beanbags.

* Adds a sprite for rubbershot and the rubbershot box

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2022-02-09 00:46:55 +00:00
SkyratBot
b398858a2b [MIRROR] Various suicide_act() things [MDB IGNORE] (#10552)
* Various suicide_act() things (#63808)

* Various suicide_act() things

Co-authored-by: DragonTrance <dylan661993@gmail.com>
2022-01-09 22:04:10 -05:00
SkyratBot
58f82b5161 [MIRROR] [Ready] MODsuits [MDB IGNORE] (#10244)
* [Ready] MODsuits

* we dont need to add these people as codeowners, goodness gracious

* have to remove this because upstream

* part 1 of these fixes

* EEEE

* Update peacekeeper_clothing.dm

* E

* E

* Auto stash before merge of "upstream-merge-59109" and "origin/upstream-merge-59109"

* E

* Update expeditionary_trooper.dm

* more removal

* nice

* modsuti modstui modusuti

* fixes

* E

* ITS MODsuit not HARDSUIT

* more hardsuit references

* MODSUIT NOT HARSUITEDSA

* Maps

* More ,map

* oop

* e

* oo aa

* 0

* ting tang

* Update modsuit_tailsprites.dm

* hi fikou

* bs tech update

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
Co-authored-by: jjpark-kb <55967837+jjpark-kb@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2021-12-25 13:32:49 +00:00
OrionTheFox
6c3ac17487 hnbhg (#10108) 2021-12-17 12:57:33 +00:00
SkyratBot
2c8be89114 [MIRROR] Moth Food Returns: A Taste of the Fleet [MDB IGNORE] (#9985)
* Moth Food Returns: A Taste of the Fleet (#63174)

* Moth Food Returns: A Taste of the Fleet

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
2021-12-10 21:52:20 +00:00
SkyratBot
b7164873d4 [MIRROR] Speeds up the preference menu, significantly. Adds object pooling, other stuff too [MDB IGNORE] (#9962)
* Speeds up the preference menu, significantly. Adds object pooling, other stuff too

* First fixes

* Feex

* Quick fix for the unit test to shut up

* Fixing the runtime with randomly-colored jumpsuits

* Fixes that one hard del

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-12-10 02:22:41 +00:00
SkyratBot
463c2fc71d [MIRROR] multiz movement refactor redux [MDB IGNORE] (#9925)
* multiz movement refactor redux (#62132)

* multiz movement refactor redux

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-12-07 08:27:12 -05:00
SkyratBot
b7b6bd501f [MIRROR] removes double spaces AFTER symbols [MDB IGNORE] (#9226)
* removes double spaces AFTER symbols

* Fixing conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-05 18:15:12 -04:00
SkyratBot
13d38add93 [MIRROR] Repaths knives to not all be children of the kitchen knife. [MDB IGNORE] (#8843)
* Repaths knives to not all be children of the kitchen knife.

* Fix

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-23 00:07:08 +01:00
SkyratBot
fa519bdde3 [MIRROR] cleanup _HELPERS/_lists.dm and all the necessary files [MDB IGNORE] (#8783)
* cleanup _HELPERS/_lists.dm and all the necessary files

* Epbic

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-13 21:07:35 +01:00
SkyratBot
c23bd1cb8c [MIRROR] every case of initialize that should have mapload, does (#8374)
* every case of initialize that should have mapload, does

* E

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 23:07:53 +01:00
SkyratBot
8e2fb2b105 [MIRROR] Adds SEAFOOD foodtype, felinid diet changes (#8343)
* Adds SEAFOOD foodtype, felinid diet changes (#61506)

* Adds SEAFOOD foodtype, felinid diet changes

* Update felinid.dm

Co-authored-by: JosephJomama <60072879+JosephJomama@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 18:24:33 +01:00
SkyratBot
7ca11b214a [MIRROR] Removes the superfluous breathing mask from the survival box of plasmamen (#8352)
* Removes the superfluous breathing mask from the survival box of plasmamen

* Update boxes.dm

Co-authored-by: FernandoJ8 <80640114+FernandoJ8@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 18:23:49 +01:00
Useroth
f900b1ec6d [MDB IGNORE] Eliminates Toxins (#60619) (#7911)
Repaths everything referring to "toxins" while actually meaning either the room in science or plasma gas. While this PR might be disrespectful to our forefathers, given this is (I believe) a holdover from as far back as the Exadv1 days, this has constantly irked me since I started working with the code. None of the player-facing stuff has referred to plasma as toxin since before 4407 hit, besides the Toxins Lab, and yet all of the type-paths are still pointing at toxins, making it a nightmare to search for in a map editor, and making the code needlessly easy to confuse with that of toxin damage. So this just fires it into the sun.

Anything relating to Toxins, the science subdepartment, now makes reference to Ordnance instead. This felt fitting enough given the focus of the subdepartment is around the creation of and testing of explosives.
Anything relating to plasma gas has, fittingly, been made to refer to plasma gas.

Edit: Ah yes, I feel I should probably apologise off the bat for the size of this PR- the code touched is mostly atmos machinery and simplemobs, a few sprites here and there, and of course the station maps + a few offstation maps.

Makes the code more legible and makes mapping less painful.

(The payment has been made)

Co-authored-by: EOBGames <58124831+EOBGames@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-01 16:50:22 +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
090198f40c Kills the misc items file (#7151)
Co-authored-by: Thunder12345 <Thunder12345@users.noreply.github.com>
2021-07-28 18:58:42 +01:00
SkyratBot
2e8690cec2 [MIRROR] Fixes missing space in happiness description (#7101)
* Fixes missing space in happiness description (#60391)

* Fixes missing space in happiness description

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
2021-07-26 15:46:33 +01:00
SkyratBot
56f7c55e8c [MIRROR] Adds missing space in medical ERT plushie box description (#6958)
* Adds missing space in medical ERT plushie box description (#60238)

* Adds missing space in medical ERT plushie box description

Co-authored-by: aaaa1023 <74441292+aaaa1023@users.noreply.github.com>
2021-07-16 20:34:48 +01:00
SkyratBot
4411d09e44 [MIRROR] adds a suicide for space helmets, fixes some other suicides (#6935)
* adds a suicide for space helmets, fixes some other suicides (#60173)

* adds a suicide for space helmets, fixes some other suicides

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
2021-07-15 22:57:07 +01:00
SkyratBot
af778bae0a [MIRROR] Fixes a good few improper overlay icon_states, fuck gun code edition (#6774)
* Fixes a good few improper overlay icon_states, fuck gun code edition

* Update rifle.dm

* Update laser.dm

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-07-08 03:11:58 +02:00
SkyratBot
87e3a63f7d [MIRROR] During unit tests, does extra verification on text based overlays (#6415)
* During unit tests, does extra verification on text based overlays (#59553)

This makes it so during unit tests, adding a text based overlay to something will runtime if the icon does not have an icon state matching that text. I would do this during normal compiles as well but getting the icon states from an icon is surprisingly expensive.

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>

* During unit tests, does extra verification on text based overlays

Co-authored-by: Emmett Gaines <ninjanomnom@gmail.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@ users.noreply.github.com>
2021-06-21 00:48:24 +01:00
SkyratBot
7d1d0e1fad [MIRROR] Refactors most spans into span procs (#6315)
* Refactors most spans into span procs

* AA

* a

* AAAAAAAAAAAAAAAAAAAAAA

* Update species.dm

Co-authored-by: Watermelon914 <37270891+Watermelon914@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-06-16 00:24:49 +01:00
SkyratBot
76b968aee3 [MIRROR] Makes it so the matchbox's matches visibly empty from the sprite when you take matches out (#6230)
* Makes it so the matchbox's matches visibly empty from the sprite when you take matches out (#59575)

* 4 fucking sprites

* forgot to make it call parent

* uses base_icon_state

Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>

* adds base_icon_state variable to matches

* base_icon_state fix

Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>

* Makes it so the matchbox's matches visibly empty from the sprite when you take matches out

Co-authored-by: Wallemations <66052067+Wallemations@users.noreply.github.com>
Co-authored-by: TemporalOroboros <TemporalOroboros@ gmail.com>
2021-06-10 23:49:44 +01:00
SkyratBot
d3a2f60d78 [MIRROR] GAGS Lizard Plushes (#6007)
* GAGS Lizard Plushes  (#59323)

* greyscale lizards

* repathing

* uses set greyscale

* mapped sprite

* GAGS Lizard Plushes

* Goodbye lizzers

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
2021-06-01 14:40:42 +12:00
SkyratBot
70dad5462d [MIRROR] REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip (#4925)
* REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip (#58268)

Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>

* REOPEN: REVERT: Changes faster fireman carrying from a trait on gloves to a skillchip

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: SuperNovaa41 <supernovaa41@ protonmail.com>
2021-04-15 16:23:00 +01:00
SkyratBot
cf1f3fa06e [MIRROR] Refactor /obj/item/food/chewable into a chewable element (#4855)
* Refactor /obj/item/food/chewable into a chewable element (#58243)

* Refactor /obj/item/food/chewable into a chewable component

* Element, always process

* Refactor /obj/item/food/chewable into a chewable element

* Update maint_loot_trash.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 01:32:21 +01:00
SkyratBot
a838bbad17 [MIRROR] Gives ERT Medical Officers a box of plushies (#3991)
* Gives ERT Medical Officers a box of plushies (#57481)

* Gives ERT Medical Officers a box of plushies

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
2021-03-08 07:40:49 +00:00
SkyratBot
e0f514671e [MIRROR] Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#3825)
* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles. (#57367)

* Creates offstation variants of the protolathe and circuit imprinter for offstation and ghost roles.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-03-04 01:02:30 +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
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
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
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
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
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
732f917bd2 [MIRROR] New emergency storage sprites (#3076)
* Unique sprites for emergency o2 tank boxes (#56624)

* New emergency storage sprites

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-02-04 21:19:58 +00:00
SkyratBot
dcb4dede41 [MIRROR] Fixes Several Holodeck Infinite Materials Exploits (#3057)
* Fixes Several Holodeck Infinite Materials Exploits (#56587)

* Fixes Several Holodeck Infinite Materials Exploits

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
2021-02-04 00:14:40 +00:00
SkyratBot
1e1d408b7f [MIRROR] Changes fireman carrying from a trait on gloves to a skillchip (#3046)
* Changes fireman carrying from a trait on gloves to a skillchip (#56593)

* Changes fireman carrying from a trait on gloves to a skillchip

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
2021-02-03 22:36:56 +00:00
MissFox0810
24466daf22 removes Uraium from matsbox, debugtools (#2603)
* removes Uraium from matsbox, debugtools

* Update code/game/objects/items/storage/boxes.dm

Co-authored-by: Azarak <azarak10@gmail.com>

Co-authored-by: MissFox <github@aesir.org.uk>
Co-authored-by: Azarak <azarak10@gmail.com>
2021-01-09 23:04:17 +01:00
SkyratBot
3711feef02 [MIRROR] wrenches the diy dish kit (#2322)
* wrenches the diy kit (#55701)

* wrenches the diy dish kit

Co-authored-by: Tlaltecuhtli <33834933+Tlaltecuhtli@users.noreply.github.com>
2020-12-25 21:41:34 +00:00
Azarak
f964b1b562 aaa (#2240) 2020-12-19 15:26:10 +00:00
SkyratBot
0c14229ef4 [MIRROR] Adds in the admin outfit. (#2123)
* Adds in the admin outfit. (#55374)

So i was told to make this if i wanted to get an outfit that actually could work on things like radiation. I also gave it a box full of stabilized extracts because those give quite good effects like more speed and regeneration.

* Adds in the admin outfit.

Co-authored-by: CRITAWAKETS <sebastienracicot@hotmail.com>
2020-12-11 00:26:34 +00:00