Commit Graph

9404 Commits

Author SHA1 Message Date
SkyratBot
896c19face [MIRROR] More Food Sorting (#5236)
* More Food Sorting (#58649)

* Organizing

Moves the following:
Enchiladas, from MEAT, to MEXICAN
Meat Bun, from PASTRIES, to MEAT
Hotdog, from PASTRIES, to SANDWICHES
Melon Bowl, from MISC, to SALADS
Oatmeal, from SALAD, to SOUPS (And changes the object path to match.)

Does the traitorous task of adding the GRAIN tag to Enchiladas. May god have mercy on my soul.

* Adds a trailing new line

Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>

* More Food Sorting

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Co-authored-by: Winter Flare <7543955+Owai-Seek@ users.noreply.github.com>
2021-04-27 00:56:40 +01:00
SkyratBot
6eb42f889d [MIRROR] Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients. (#5232)
* mail fixes 😎 (#58716)

now mail doesn't get sent to... BAD recipients. (Antags arm, just say antags)
fixes incorrect unwrapping message (bad usage of a visible message)
mail recipients wasn't shuffling either. I'm fairly certain this was leading to some people always getting mail and some never getting it.

* Fixes incorrect unwrapping message, and now mail doesn't get sent to... BAD recipients.

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-27 00:01:18 +01:00
SkyratBot
eaf3dd34fa [MIRROR] screwdrivers no longer randomize their pixel_y on initialize (#5231)
* screwdrivers no longer randomize their pixel_y on initialize (#58707)

removes the 75% chance on screwdrivers initialize to have a random pixel_y between 0 and 16

it looks bad now that the screwdriver is centered on the tile

* screwdrivers no longer randomize their pixel_y on initialize

Co-authored-by: Fikou <piotrbryla@onet.pl>
2021-04-27 00:00:56 +01:00
SkyratBot
32c7ef7574 Smarter pipes (#5228)
Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-04-26 22:59:05 +01:00
SkyratBot
3d4f861a32 [MIRROR] Fixes Chameleon Projector Dummies escaping containers (#5205)
* Fixes Chameleon Projector Dummies escaping containers (#58683)

You can see why this is bad from the issue, but it applies a lot of other places you can cram the projector into. Like transit tubes! Or vehicles! Or free escapes from welded lockers! Spooky.

* Fixes Chameleon Projector Dummies escaping containers

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-26 11:58:58 +01:00
SkyratBot
c8e824a1df [MIRROR] Fixes an infinite RCD material exploit (#5189)
* Fix infinite RCD bug (#58669)

* Fixes an infinite RCD material exploit

Co-authored-by: Urumasi <Urumasi@email.cz>
2021-04-26 11:55:57 +01:00
SkyratBot
2ab15aecb5 [MIRROR] Remove all gamemodes except Dynamic (#5173)
* Remove all gamemodes except Dynamic

* qaaaaaaaa

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-25 21:20:30 +01: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
03db312b96 [MIRROR] Tool Resprite? (#5165)
* Tool Resprite (#58616)

* Tool Resprite?

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
2021-04-25 03:30:29 +01:00
FlamingLily
210c09cf6e Update belt.dm (#5159) 2021-04-24 18:20:39 +01:00
SkyratBot
16cc1c4a1e [MIRROR] Fixes ?. nonsense. (#5152)
* Fixes ?. nonsense. (#58630)

Co-authored-by: Fikou <piotrbryla@ onet.pl>

* Fixes ?. nonsense.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Fikou <piotrbryla@ onet.pl>
2021-04-24 13:54:25 +01:00
SkyratBot
886e4b56d3 [MIRROR] Mexican Food Tab, Food Tagging Tweaks (#5141)
* Mexican Food Tab, Food Tagging Tweaks (#58622)

* Tagging Fixes, Food Moves

Fixes Food Tags on a bunch of burritos. (3/4 don't use MEAT. They were tagged with MEAT.)
Fixes Food Tag and renames Egg Wrap (It doesn't use Tortillas. No GRAIN)
Moves Scotch Egg and Egg Wrap to EGG foods.

Makes a Mexican Food Tab, and moves burritos, tacos, and nachos into it.

* Mexican Food Tab, Food Tagging Tweaks

Co-authored-by: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
2021-04-24 00:41:35 +01:00
SkyratBot
b826379ef8 [MIRROR] Changes reinforced window deconstruction to right click (#5114)
* Changes reinforced window deconstruction to right click

* Update weldingtool.dm

Co-authored-by: dragomagol <66640614+dragomagol@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-23 22:14:08 +01:00
FlamingLily
6dc2a67768 Disables the electrical welder and brings back OG e-welder, pending fixes. (#5045)
* Update tool_designs.dm

* Update electric_welder.dm

* Update belt.dm

* fuck
2021-04-23 21:49:37 +01:00
SkyratBot
9e19dc298a [MIRROR] nitrile gloves buff (#5098)
* nitrile gloves buff (#58594)

* nitrile gloves buff

Co-authored-by: manofpepsi <71612753+manofpepsi@users.noreply.github.com>
2021-04-23 21:46:37 +01:00
BluBerry016
623efa69d7 AAAAAA (#5014) 2021-04-23 21:45:50 +01:00
Winter Flare
e4160263a6 Makes Gear Harness craftable. Adds Loincloth to Dorm Vend. (#5103)
* Dorm Vend Tweaks

Adds Dorm Vendor Repack to Cargo
Adds Loincloth to Vendor
Adds Gear Harness to Leather Crafting

* Fixed Sheetcrafting
2021-04-23 21:45:29 +01:00
SkyratBot
c961925acc [MIRROR] Exorcises shitcode demons out of an unobtainable piece of farm equipment (#5069)
* Exorcises shitcode demons out of an unobtainable piece of farm equipment (#58568)

* Removes code that does nothing

* Adds comments

Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>

* Exorcises shitcode demons out of an unobtainable piece of farm equipment

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: Your mother <mothmilk666666666666@ tfwno.gf>
2021-04-21 18:33:57 +01:00
SkyratBot
0f4938bf5c [MIRROR] Adds comments to handcuffs.dm (#5067)
* Adds comments to handcuffs.dm (#58478)

* update

* Adding changes made to file in #58456

* Comments handcuffs in handcuffs.dm

* Comments for legcuffs stuff

* Final touches

* Adds two newlines that make the code a bit prettier

* Changed handcuff subtype comments

Mostly removing useless extended descriptions from cablecuff subtypes

* Alien handcuffs comment now actually states what they are

* IT'S BLAND YOU SAY?

* Removes bloat

Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>

* Adds comments to handcuffs.dm

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
Co-authored-by: BuildTools <unconfigured@ null.spigotmc.org>
Co-authored-by: MothMilk666 <mothmilk666666666666@ tfwno.gf>
2021-04-21 18:33:47 +01:00
SkyratBot
d5bf2b0b4e [MIRROR] Converts screwdrivers to GAS (#5058)
* Converts screwdrivers to GAS (#58453)

* Basic GAS setup

* Compile fix

* Fixes, inhands, belt icons

* New procs

* New version of GAGS

* Inhand for subtypes

* Typo fix

* Converts screwdrivers to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-04-21 05:53:17 +01:00
SkyratBot
68d376d367 [MIRROR] Fixes some typos in frozen.dm descriptions (#5056)
* Fixes some typos in frozen.dm descriptions (#58539)

* Fixes some typos in frozen.dm descriptions

Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-21 04:08:37 +01:00
SkyratBot
d0510f16c8 [MIRROR] Reverse bear trap resprite (#5042)
* Reverse bear trap resprite (#58411)

imageadd: added new icons for reverse bear trap

* Reverse bear trap resprite

Co-authored-by: Greniza <61635418+Greniza@users.noreply.github.com>
2021-04-20 16:29:14 +01:00
SkyratBot
26f7af3e1a [MIRROR] Fixes chicken and exotic meats not processing into meatballs. (#5035)
* Fixes chicken and exotic meats not processing into meatballs (#58509)

* Fixes chicken and exotic meats not processing into meatballs.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-04-20 05:04:38 +01:00
OrionTheFox
344f11b9c6 FIX FOR Eyepatch Left/Right Toggle! (#4949) (#5001)
* toggleable eyepatch side

the day we've been waiting for.,

* HAHAHAHHA WHOOPS

I FORGOT A CHECK TO MAKE SURE THAT ALL EYEWEAR SPRITES DIDNT TRY TO ADD _R TO THE END
2021-04-20 01:29:32 +01:00
SkyratBot
16112497c8 [MIRROR] Completely removes unused caution sign from code (#5026)
* Completely removes unused caution sign from code (#58532)

Tiny atomic pr that zaps the old unused caution sign out of both its icon file, the code, that one random map file it was still in, metastation, and rearranged metastation. You can now properly wear caution signs from all sources!

* Completely removes unused caution sign from code

* removes obj/item/caution

Co-authored-by: Kokonut <38844529+maxymax13@users.noreply.github.com>
Co-authored-by: KathrinBailey <evesovereign@hotmail.co.uk>
2021-04-19 21:58:26 +01:00
Gandalf
553b707ba3 aaa (#5016) 2021-04-18 21:31:42 +01:00
Gandalf
abfb646aa2 Removes assaultops (#4952)
* aAAA

* aaa
2021-04-18 20:47:10 +02:00
SkyratBot
6c8b4ddcd4 [MIRROR] Scrolling layers for RPD is more snappy. It is also no longer flipped. (#4995)
* Scrolling layers for RPD is more snappy. It is also no longer flipped. (#58493)

* Scrolling layers for RPD is more snappy. It is also no longer flipped.

Co-authored-by: vincentiusvin <54709710+vincentiusvin@users.noreply.github.com>
2021-04-18 14:27:48 +01:00
Gandalf
6b8a912840 Item use power and cell component refactor (#4900)
* aaaaaaa

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* aaaaa

* aaaaaaaaaaaaaaaaaaaaa

* Update flashlight.dm

* Update flashlight.dm

* aaaaaaaaaaaaaaaaaaaaaaaaaaaa

* AAAAAAAAAA

* Update _wires.dm

* aaaa

* AAAAAAAAAAAAAAAAA

* aaa

* Update cell_component.dm

* aaaa

* AAAAAAAAAAAAAAA

* AAAAAAAAAA

* AAAAAAAA

* Update youtool.dm

* aaaaaaaa

* aaaa

* aaaa

* asaa

* HOLY FUCK YOU GUYS ARE ALL SO LAZY JESUS FUCKING CHRIST

* aaaaa

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update cell_component.dm

* Update traitordevices.dm

* aaa

* Update traitordevices.dm

* Update traitordevices.dm

* aaa

* Update cell_component.dm

* POWER CELLS VERSION 2

* OH YEAH BABY

* A

* Update cell_component.dm

* Update flashlight.dm

* AAAAAA

* Update flashlight.dm

* Update atoms.dm

* aa

* AAAAAAAAAAAAA

* aa

* Update multi_cell_charger.dm

* Update flashlight.dm

* Update flashlight.dm

* Update multi_cell_charger.dm

* aaa

* Update _wires.dm

* Update electric_welder.dm

* aaaaa

* Update tools.dmi
2021-04-18 15:09:13 +02:00
Gandalf
9decfc49f6 Revert "toggleable eyepatch side (#4949)" (#4986)
This reverts commit 774824da18.
2021-04-17 19:45:43 +01:00
SkyratBot
129f09b657 [MIRROR] Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets (#4984)
* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets (#58114)

* Hollowpoints and similar attacks/weapons double existing armor, not add total armor, to the their targets

* a

* Update tools.dmi

* Update tools.dmi

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 17:18:04 +01:00
OrionTheFox
774824da18 toggleable eyepatch side (#4949)
the day we've been waiting for.,
2021-04-17 16:01:42 +01:00
Gandalf
b40d89db02 Security boot crunch (#4967)
* aaa

* Update miscellaneous.dm

* aaaa
2021-04-17 15:50:12 +01:00
SkyratBot
0618a7d95e [MIRROR] Minor code readability improvement to default values of the breakouttime var (#4982)
* Minor code readability improvement to default values of the breakouttime var (#58456)

Replaces time expressed in deciseconds with time expressed in deciseconds but with use of the MINUTES and SECONDS defines for readability.

* Minor code readability improvement to default values of the breakouttime var

Co-authored-by: interestingusernam3 <51925758+interestingusernam3@users.noreply.github.com>
2021-04-17 15:45:57 +01:00
SkyratBot
fa8e5628e6 [MIRROR] Move eyestabbing to an element, rather than as part of core combat code (#4964)
* Move eyestabbing to an element, rather than as part of core combat code

* Update item_attack.dm

* Update item_attack.dm

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-17 01:57:45 +01:00
SkyratBot
3ef3c1193c [MIRROR] Adds worn overlay y offset variable. (#4930)
* Adds worn overlay y offset variable. (#58400)

Co-authored-by: Krysonism <49783092+Krysonism@ users.noreply.github.com>

* Adds worn overlay y offset variable.

* Update human_update_icons.dm

* Update human_update_icons.dm

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: Krysonism <49783092+Krysonism@ users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2021-04-16 13:26:07 +02:00
SkyratBot
1f0092aa3a [MIRROR] Removes the slur from a possible smoke bomb description (#4936)
* Removes the slur from a possible smoke bomb description (#58360)

* Removes the slur from a possible smoke bomb description

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-04-16 00:55:50 +01:00
SkyratBot
1fa8f89cd1 [MIRROR] Converts wirecutters to GAS (#4927)
* Converts wirecutters to GAS (#58307)

* New wirecutters Greyscale

* New procs use

* Converts wirecutters to GAS

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-15 17:13:49 +01: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
7b823360c0 [MIRROR] Removes Ethereal blood's shocking properties (#4912)
* Removes Ethereal blood's shocking properties (#58408)

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

* Removes Ethereal blood's shocking properties

Co-authored-by: Qustinnus <Floydje123@hotmail.com>
Co-authored-by: ATH1909 <42606352+ATH1909@ users.noreply.github.com>
2021-04-15 16:21:43 +01:00
SkyratBot
2a26d1a54d [MIRROR] Four New Sects, small rethemes to first 3 (#4832)
* Four New Sects, small rethemes to first 3

* Update species.dm

* Update species.dm

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-04-13 12:27:21 +01:00
Guilherme
a60deb0b31 [Non-Modular]The Buff nobody wanted. Wallet (#4857)
* The Buff nobody wanted

* Update wallets.dm
2021-04-13 11:56:25 +01:00
SkyratBot
9fe97850b2 [MIRROR] stations name their respective celestial bodies (#4881)
* stations name their respective celestial bodies (#58168)

* stations name their respective celestial bodies

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-13 11:43:19 +01:00
SkyratBot
16d386f45d [MIRROR] refactors pods, new helper for spawning items from pods through code (#4879)
* refactors pods, new helper for spawning items from pods through code (#58222)

* refactors pods, new helper for spawning items from pods through code

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-04-13 11:43:10 +01:00
SkyratBot
415c68bfe0 [MIRROR] Adds color picking as RPD right click action (#4874)
* Adds color picking as RPD right click action (#58309)

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

* Adds color picking as RPD right click action

Co-authored-by: thebleh <43266738+rdragan@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
2021-04-13 11:33:30 +01:00
SkyratBot
4c68e4fe4e [MIRROR] Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern. (#4864)
* Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern. (#58236)

About The Pull Request

ID cards when equipped will check the player's living hours if the USE_LOW_LIVING_HOUR_INTERN flag is set. If their living hours is less than the first of the following (checked in order from 1st to 3rd until a valid value is found):

    Config USE_LOW_LIVING_HOUR_INTERN_HOURS
    Config USE_EXP_RESTRICTIONS_HEADS_HOURS
    Hardcoded 15 hours

Then their ID card is tagged as Intern Assignment, unless they're a Head of Staff in which case they become an Assignment-in-Training.

PDAs, Wallets and Tablets also update any ID cards they hold, so equipping a PDA, Tablet or Wallet will also update any ID cards inside it.

This occurs automatically, even if the card does not belong to the owner. This only occurs when the user's assigned_role is a station job.

* Implements a new auto-tagging system for ID card which adds a config to auto-flag them as an intern.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-04-13 02:01:42 +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
a52b9f6bbf [MIRROR] Makes radiation related pluouxium only generate in cold conditions (#4837)
* Pluoxium can currently be created in mico amounts on a lot of tiles, which creates a lot of unneeded active (#58306)

turfs, and wastes processing time.
Let's only make pluox in cold mixes then, and since it's not gonna mitigate high power runaways quite as hard
now, let's make it a net negative on waste gas output for the sm.

* Makes radiation related pluouxium only generate in cold conditions

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
2021-04-12 04:43:31 +01:00
NopemanMcHalt
54b191a0ef Adjusts black and brown flannels sprites (#4795)
Also modularizes trashbag's QoL and adds belt sprites for it.
2021-04-10 19:39:38 +01:00
Gandalf
b32b65fbe3 Mutants - HNZ1 - A medical and scientific adventure! (#4664)
* aaa

* AAAAAAAA

* aaa

* aaaaa

* aaa

* Update zombie_cure.dm

* Update zombie_techweb.dm

* Update zombie_cure.dm

* Update zombie_cure.dm

* a

* THEY ARE MUTANTS, NOT ZOMBIES

* aaaaa

* aaaa

* Update mutant_event.dm

* aaaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* aaaaaaaaaaaa

* Update mutant_parts_greyscale.dmi

* aaaa

* Create research2.dmm

* 0

* Update mutant_datum.dm

* Update research2.dmm

* aaaa

* Update mutant_datum.dm

* aaaa

* aaaa

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_cure.dm

* Update mutant_datum.dm
2021-04-10 18:32:09 +01:00