Commit Graph

9794 Commits

Author SHA1 Message Date
Pinta d2456f3fe0 Update belt.dm (#8934) 2021-10-20 07:11:04 -04:00
SkyratBot b4a3597388 [MIRROR] Refactor rolling paper to use customizable reagent holder [MDB IGNORE] (#8905)
* Refactor rolling paper to use customizable reagent holder (#61758)

The component can accept dryable items and food items now. Any instance of the component can be set to use dryable items, just like normally food items are used. To add the dryable item, it's the same as with food. You attack with the item in hand. I am currently thinking about more uses for dryable items and also more ways the component can be used.

* Refactor rolling paper to use customizable reagent holder

Co-authored-by: Jack LeCroy <3073035+jacklecroy@users.noreply.github.com>
2021-10-18 11:11:11 -04:00
Gandalf d095ec38a8 New job! Barber and salon! (#8756)
* Oh hi Mark.

* hand dryer 4000

* E

* fur dyer

* actually makes it work

* Update fur_dyer.dm

* Update fur_dyer.dm

* Final touches!

* Update jobs.txt

* le straight razor

* f

* Update hhmirror.dm

* updoot

* Update IceBoxStation_skyrat.dmm

* E

* No more failure penalties, it's bad.

* logic errors

* actual hairdye

* Update barber.dm

* Rebases to newer map versions

Fixes multiple issues with the original map changes in this PR, which are as follows but not limited to:
• Trapping Lawyers in their office on Blueshift
• Incorrect curtain types
• Awkward atmos
• Broken disposals
• Missing wallmounts
• Missing firelocks

* camera on meta

* Update jobs.dm

* more dyesprays

Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-10-18 13:11:11 +13:00
SkyratBot 08b4db1d91 [MIRROR] Power generation (collectors, coils, grounding rods) cleanup [MDB IGNORE] (#8871)
* Power generation (collectors, coils, grounding rods) cleanup (#62144)

* Energy collection: Mass rework

Radiation Collectors and Tesla Coils are now subtyles of a common
energy_accumulator type. This type combines common code such as smoothing
output over energy received, computing power output, and handling wire
connections.

Inline calculations using machine energy units are now performed by
common math functions in maths.dm. Rather than reference 0.1,
1 SECONDS is used to make it clear this is to calculate to and from
tickrate dependent units.

Constants which are written in terms of tickrate dependent units are now
written in terms of joules, and use these helpers to convert to and from
these units. With SSmachines.wait / (1 SECONDS) being 2, this usually
means doubling the values of constants which were previously defined in
terms of machine energy units.

* Energy collection: Map path update

> git ls-files | grep dmm | xargs sed -i 's1rad_collector1energy_accumulator/&1g'
> git ls-files | grep dmm | xargs sed -i 's1tesla_coil1energy_accumulator/&1g'
> git ls-files | grep dmm | xargs sed -i 's1grounding_rod1energy_accumulator/&1g'

* Power generation (collectors, coils, grounding rods) cleanup

* object path update (#8882)

* [MDB IGNORE] Missed some paths (#8886)

* object path update

* oops missed a couple paths

Co-authored-by: esainane <esainane+github@gmail.com>
Co-authored-by: ORCACommander <orcacommander1@gmail.com>
2021-10-17 23:17:02 +01:00
SkyratBot b8b2f988ac [MIRROR] Brings recycling results of advanced tools up to their printing costs [MDB IGNORE] (#8896)
* Brings recycling results of advanced tools up to their printing costs (#62092)

Advanced tools have either been using their parent basic tools' custom_materials or their custom_materials were lowered for what I presume was destructive experimentor work. This counts for recycling these items in an autolathe as well. In the first case, alien tools were made out of the same material amount as their basic counterparts, and in the second case - the recycling results were heavily lowered.
Also kills off some single-letter vars since I'm here.

* Brings recycling results of advanced tools up to their printing costs

Co-authored-by: Sealed101 <75863639+Sealed101@users.noreply.github.com>
2021-10-17 23:16:26 +01:00
SkyratBot a49f0a371a [MIRROR] Updates the Goon Source code objective item to be on par with all other high risk items. [MDB IGNORE] (#8887)
* Updates the Goon Source code objective item to be on par with all other high risk items. (#62142)

Currently, all it takes to ruin an antagonist's round (assuming they have this objective) is to walk into the server room, and break the master server, as this will delete the drive inside. It is extremely weak, a fire axe will break it in less than 15 seconds.

Not only that, but the drive itself is also not resistant, making it relatively easy to lose it and have it destroyed in various station emergencies.
Compared to every other high risk item, this doesn't make much sense, as they are all supposed to be virtually impossible to get rid off.

This does not effect the ninja's objective of destroying the drive.

This ups the integrity of the master server, making it take ~15s longer to break it with a wielded fire axe, than it does to just deconstruct it. It also adds resistances to the drive itself, which brings it up to the same level as every other high risk item.

Closes #62128

* Updates the Goon Source code objective item to be on par with all other high risk items.

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
2021-10-17 15:13:57 -04:00
SkyratBot f0db07b17d [MIRROR] makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy [MDB IGNORE] (#8840)
* makes it so the sanitize_hexcolors' default is 6 characters rather than 3 and gets rid of color_legacy

* Feex

* Feex some more

* Final feex

* Please no more I'm tired

* <<<<<<< HEAD

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-17 00:30:28 -04:00
SkyratBot 1061168bd1 [MIRROR] Prevent aghosted admins from being forcibly dragged back to their body when being defibbed [MDB IGNORE] (#8866)
* Prevent aghosted admins from being forcibly dragged back to their body when being defibbed (#62048)

Aghosted admins won't be forcibly dragged back to their body when being defibbed.

* Prevent aghosted admins from being forcibly dragged back to their body when being defibbed

Co-authored-by: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com>
2021-10-16 20:35:12 -04:00
SkyratBot 793b0a3836 [MIRROR] Adds worn icon to the fire extinguishers. [MDB IGNORE] (#8854)
* Extinguisher worn icons (#62135)

* Adds worn icon to the fire extinguishers.

Co-authored-by: GuillaumePrata <55374212+GuillaumePrata@users.noreply.github.com>
2021-10-16 15:03:20 -04:00
SkyratBot 469f389ef5 [MIRROR] Adds dropper tool on right click for spray cans [MDB IGNORE] (#8856)
* Adds dropper tool on right click for spray cans (#62119)

* spraycan dropper

* grammar

* grammar2

* Update code/game/objects/items/crayons.dm

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>

* Adds dropper tool on right click for spray cans

Co-authored-by: Mickyan <38563876+Mickyan@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@ users.noreply.github.com>
2021-10-16 14:58:11 -04:00
SkyratBot d5cc576efb [MIRROR] Drowsiness refactor [MDB IGNORE] (#8836)
* Drowsiness refactor (#62104)

Creates two procs in /mob/status_procs for handling drowsiness changes (with check for negative values), and refactors all code to use these procs instead of assigning values to the mob's drowsiness themselves.

* Drowsiness refactor

* Fixing more stuff in our code

Co-authored-by: thatoneplebeian <67017991+thatoneplebeian@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-15 13:41:35 -04:00
SkyratBot 230a34588f [MIRROR] modules/atmospherics major cleanup [MDB IGNORE] (#8818)
* modules/atmospherics major cleanup

* E

* E

* 0

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-14 22:44:30 +01:00
SkyratBot 56fddbf762 [MIRROR] Fixes pipes not fulfulling nicotine withdrawal [MDB IGNORE] (#8823)
* Fixes pipes not fulfulling nicotine withdrawal (#61993)

Co-authored-by: seth-scherer <seth.scherer@ protonmail.com>

* Fixes pipes not fulfulling nicotine withdrawal

Co-authored-by: Seth Scherer <supernovaa41@protonmail.com>
Co-authored-by: seth-scherer <seth.scherer@ protonmail.com>
2021-10-14 21:20:36 +01:00
SkyratBot 01a41bef0d [MIRROR] Printer Circuit Component [MDB IGNORE] (#8825)
* Printer Circuit Component (#62012)

I'm adding a circuit component that can print text string on a paper object in a variety of colors and font typefaces (currently only web-safe ones are available, maybe i'll add some fancy ones in the future but they'd need to be imported either through @ import of @ font-face in a separate CSS not imported by every tgui UI).
It's important to note that because the UI sanitizes new text inputed by users and not what's already written on the paper (so the pen_color and pen_font don't be purged in the process), we can't safely have these strings "printed" into the info variable directly, because of that these values will be stored in two new list variables, one for the text and one for font color, face and the signature. When the paper sheet UI is opened, these will be sanitized and then parsed into the text, so the next time the paper is edited we can clear these two lists.
Obviously better than a hacky byond proc - parsemarkdown() is outdated af -, albeit a bit messy... like the rest of paper code.

Requires #62033.

* Printer Circuit Component

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2021-10-14 21:20:22 +01:00
Seris02 471ae4d55e lots of fixes (#8820) 2021-10-14 15:18:21 +01:00
SkyratBot 57b23467ef [MIRROR] Fixes lavaproof upgrade for minerborgs not working. [MDB IGNORE] (#8808)
* Fixes lavaproof upgrade for minerborgs not working (#62083)

* Fixes lavaproof upgrade for minerborgs not working.

Co-authored-by: Coconutwarrior97 <40315842+Coconutwarrior97@users.noreply.github.com>
2021-10-14 15:10:00 +01:00
linnpap c2ff1c674b [NON MODULAR] Vape carts + THC tweaks (#8285)
* cart life 2

* more carts

* 1984

* Update cigs_lighters.dm

* replaced empty mutatelists with null

* variable name shit

* bullshit

* muh indentations

* oh my fucking godDDD

* I LOVE BYOND

* please JUST FUCKING WORK

* suggested changes

* balance change
2021-10-13 21:08:32 +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
Pinta 6bb61699a9 [MOSTLY MODULAR][REFACTOR] Refactors Mediguns into a subtype of Cell-Loaded guns. (#8724)
* The start

* More work

* firing modes

* Now displays ammo type when swapping and examining

* code refactoring

* replaces a bunch of code

* custom medicell text

* Update emitter.dm

* removes some testing stuff that isn't needed anymore

* repaths medicells

* This bothered me

* now uses conversion kit framework from https://github.com/Skyrat-SS13/Skyrat-tg/pull/8506/files instead of crafting
2021-10-13 20:20:57 +01:00
SkyratBot 6cdded2bad [MIRROR] no more regal rat runtimes, and, cheeeeeeeeeeeese can now be eaten by it [MDB IGNORE] (#8793)
* no more regal rat runtimes, and, cheeeeeeeeeeeese can now be eaten by it (#62032)

* no more regal rat runtimes, and, cheeeeeeeeeeeese can now be eaten by it

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
2021-10-13 19:09:58 +01:00
SkyratBot 99aaf6e658 [MIRROR] Adds a BLT sandwich to the game [MDB IGNORE] (#8797)
* Adds a BLT sandwich to the game (#62031)

About The Pull Request

Adds a BLT sandwich to the game, including a sprite for it. It can be crafted with bread slices, two bacon, one cabbage, and one tomato.

image
Why It's Good For The Game

Spaceman game thirteen would really benefit from having people eat a nice BLT once in awhile, plus the sandwich category only has one actual sandwich with meat in it (don't tell me a hotdog is a sandwich). Also, highly requested by some people (myself and this guy).

image
Changelog

cl
expansion: Adds a BLT sandwich as a new food to the game.
/cl

* Adds a BLT sandwich to the game

Co-authored-by: SomethingFish <73157400+SomethingFish@users.noreply.github.com>
2021-10-13 11:09:15 +01:00
SkyratBot 29d367a351 [MIRROR] runtime fix for hands of cards [MDB IGNORE] (#8764)
* runtime fix for hands of cards (#62027)

title

index out of bounds runtime fix on line 905, overlay_cards was = 1, and so it was trying to do things it shouldn't

* runtime fix for hands of cards

Co-authored-by: Seris02 <49109742+Seris02@users.noreply.github.com>
2021-10-12 01:46:12 +01:00
SkyratBot 58c7729d88 [MIRROR] Rad collectors gone, tesla coils to generate power [MDB IGNORE] (#8697)
* Rad collectors gone, tesla coils to generate power (#61917)

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

* Rad collectors gone, tesla coils to generate power

* replaces rad collectors

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com>
Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-10-10 17:13:06 +01:00
SkyratBot b0b0800528 [MIRROR] CE blueprints: Fix structural overlay [MDB IGNORE] (#8729)
* CE blueprints: Fix structural overlay (#61974)

CE blueprints come with a niche but situationally useful ability to view the original atmos, disposals, and power cable layout.

This has suffered a fair amount of bitrot. Not only was this not updated to use the plane and layer variables, but it also didn't handle any client running in widescreen mode - RANGE_TURFS requires a numerical parameter for its radius parameter, and cannot handle a modern viewstring such as "17x17".

* CE blueprints: Fix structural overlay

Co-authored-by: esainane <esainane+github@gmail.com>
2021-10-10 15:40:25 +01:00
Seris02 6e76fbc6bb runtime fix (#8735) 2021-10-10 15:27:41 +01:00
SkyratBot b31de21bfc [MIRROR] Adds crafting recipe for catwalk floor tiles [MDB IGNORE] (#8684)
* Adds crafting recipe for catwalk floor tiles

* Feex

Co-authored-by: Colovorat <35225170+Colovorat@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2021-10-08 08:18:32 -04:00
SkyratBot 210b17557e [MIRROR] Cytology Adjacent Update #2: Carp scale crafting. [MDB IGNORE] (#8682)
* Cytology Adjacent Update #2: Carp scale crafting.  (#61913)

expansion: Adds carp scales, and carp scale crafting.

* Cytology Adjacent Update #2: Carp scale crafting.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-10-08 07:47:10 -04:00
SkyratBot 86bafa62a2 [MIRROR] Adds catburgers, egg with sausage, and sausage bread. [MDB IGNORE] (#8683)
* Adds catburgers, egg with sausage, and sausage bread. (#61894)

expansion: Added 3 new foods: Catburgers, Egg with sausage, and Sausage bread.

* Adds catburgers, egg with sausage, and sausage bread.

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-10-08 07:35:24 -04:00
SkyratBot 1015101afd [MIRROR] Lets the Goat Plushie huff fat clouds [MDB IGNORE] (#8685)
* Lets the Goat Plushie huff fat clouds (#61830)

expansion: The Goat Plushie has picked up some bad habits

* Lets the Goat Plushie huff fat clouds

Co-authored-by: Wallem <66052067+Wallemations@users.noreply.github.com>
2021-10-08 07:25:26 -04:00
SkyratBot 5db277278d [MIRROR] Choice Beacons now use TGUI menus [MDB IGNORE] (#8656)
* Choice Beacons now use TGUI menus (#61940)

Choice beacons (Curators/Chaplains/Cooks/Any other that might exist) now use a TGUI menu rather than the default whitebox menu.

* Choice Beacons now use TGUI menus

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
2021-10-07 12:47:56 -04:00
SkyratBot cc93b11d23 [MIRROR] _HELPERS/unsorted.dm has been sorted [MDB IGNORE] (#8627)
* _HELPERS/unsorted.dm has been sorted

* Feexing conflicts

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-10-06 22:07:01 +01:00
SkyratBot 9526772dc7 [MIRROR] Removes the augment painter, moves the function to spraycan rightclicking. [MDB IGNORE] (#8643)
* Removes the augment painter, moves the function to spraycan rightclicking. (#61814)

Right-clicking a robotic body part with a spraycan will open a radial menu and allow for coloring the body part just like the augment painter did. This costs five charge off the spraycan, meaning a single can will paint six augments.

The augment painter has been removed from the game files and from all maps.

* Removes the augment painter, moves the function to spraycan rightclicking.

* removes augment painter

Co-authored-by: zxaber <37497534+zxaber@users.noreply.github.com>
Co-authored-by: Kat <evesovereign@hotmail.co.uk>
2021-10-06 19:57:00 +01:00
SkyratBot d578ba52e4 [MIRROR] More girder building [MDB IGNORE] (#8569)
* More girder building (#61795)

Allow players to build a girder on a turf by r-clicking the turf with a sheet of iron with enough material in it (2 sheets needed, the same as building it by UI on your location), the girders are not anchored when built this way
Removed girders from iron sheet construction menu and added an examine text for the new girder build way

* More girder building

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
2021-10-02 21:15:02 +01:00
SkyratBot ba55464303 [MIRROR] Fix the hair dye spray's size cause I forgot to do it three months ago. [MDB IGNORE] (#8559)
* Fix the hair dye spray's size (#61797)

* Fix the hair dye spray's size cause I forgot to do it three months ago.

Co-authored-by: Cimika/Lessie/KathyRyals <65850818+KathyRyals@users.noreply.github.com>
2021-10-02 21:13:29 +01:00
SkyratBot b136dbe9eb [MIRROR] Fixes spirit holding component not working on null rods by adding the subtype picker component to null rods [MDB IGNORE] (#8556)
* Fixes spirit holding component not working on null rods by adding the subtype picker component to null rods (#60767)

Null rods were not calling parent on attack_self and thus not sending signals to the component. DUMB! STINKY!!!!

I have elected to make subtype picking a component itself so this mistake will never be remade

fixes #60712 (possessed blades cannot awaken a spirit)

also, fixes spirit holder not making sounds

* Fixes spirit holding component not working on null rods by adding the subtype picker component to null rods

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2021-10-02 21:12:47 +01:00
SkyratBot 1231c6fa58 [MIRROR] Add local APC cache to /area [MDB IGNORE] (#8550)
* Add local APC cache to /area (#61655)

About The Pull Request

for(var/obj/machinery/power/apc/APC in GLOB.apcs_list) in get_apc makes chuck norris shed a tear
Why It's Good For The Game

tears are bad
Changelog

cl
code: /area now retains a local reference to the APC in the area, if any
/cl

* Add local APC cache to /area

Co-authored-by: esainane <esainane+github@gmail.com>
2021-10-02 02:34:42 +01:00
Gandalf ead36fce72 e (#8535) 2021-10-01 21:28:49 +01:00
SkyratBot 13fe213621 [MIRROR] [MDB Ignore] Make shuttle windows deconstructable [MDB IGNORE] (#8463)
* [MDB Ignore] Make shuttle windows deconstructable

* E

* re

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:21:36 +01:00
SkyratBot 6a3a1aed83 Rendering refactor P1: Plane unification and render relaying (pictures and video included) (#8479)
Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
2021-10-01 00:08:39 +01:00
SkyratBot f8d89cbcfd [MIRROR] Fixes a few nullrod menu descriptions and provides better wording of block chances [MDB IGNORE] (#8487)
* Fixes a few nullrod menu descriptions and provides better wording of block chances (#61752)

This PR fixes a few of my grammar mistakes in the nullrod radial menu descriptions and also better clarifies block chances (50% -> medium, 40% -> medium-low) of the certain nullrod variants to avoid confusion.

* Fixes a few nullrod menu descriptions and provides better wording of block chances

Co-authored-by: Arkatos1 <43862960+Arkatos1@users.noreply.github.com>
2021-09-29 22:02:59 +01:00
SkyratBot 226f825be1 [MIRROR] Constructable Filing Cabinets [MDB IGNORE] (#8478)
* Constructable Filing Cabinets (#61746)

* Constructable Filing Cabinets

Co-authored-by: 567Turtle <91508746+567Turtle@users.noreply.github.com>
2021-09-29 05:55:17 +01:00
SkyratBot 8c8af2064d [MIRROR] Cytology Adjacent Update #1: New pet food, made from pets. Buffs health of selected simple mobs. [MDB IGNORE] (#8471)
* Cytology Adjacent Update #1: New pet food, made from pets. Buffs health of selected simple mobs. (#61532)

* doggy dog world

* space begone

* suggestions from review

* removes frog related oopsie

* indent fix

* Cytology Adjacent Update #1: New pet food, made from pets. Buffs health of selected simple mobs.

Co-authored-by: Krysonism <49783092+Krysonism@users.noreply.github.com>
2021-09-29 02:16:03 +01:00
Iamgoofball f7677075f2 Fixes Families outfits having rendering issues. (#8447) 2021-09-28 08:12:17 -04:00
SkyratBot ec84d03d09 [MIRROR] FAMILIES 4.0: "fuck it, MRP only this time" (#8420)
* FAMILIES 4.0: "fuck it, MRP only this time"

* F

Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-28 00:08:13 +01:00
SkyratBot 93675c6c6f [MIRROR] Changes a bunch of New()s to Initialize()s (#8408)
* Changes a bunch of New()s to Initialize()s (#61626)

* Changes a bunch of New()s to Initialize()s

Co-authored-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2021-09-26 14:27:27 +01:00
SkyratBot 357150d50e [MIRROR] Change the word filter configuration to allow providing reasons, fix emotes not working in filters, and implement separate OOC/IC/PDA filters (#8406)
* Change the word filter configuration to allow providing reasons, fix emotes not working in filters, and implement separate OOC/IC/PDA filters (#61606)

* Change the word filter configuration to allow providing reasons, fix emotes not working in filters, and implement separate OOC/IC/PDA filters

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
2021-09-26 14:26:51 +01:00
SkyratBot 6f60fcb60a [MIRROR] Replaces downloading research notes with a new antag objective and station sabotage point. (#8401)
* Replaces downloading research notes with a new antag objective and station sabotage point. (#61685)

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

* Replaces downloading research notes with a new antag objective and station sabotage point.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
2021-09-26 01:49:02 +01:00
jjpark-kb bed7b774a1 glassblowing and ceramics (#8244)
* okay

* ceramics and glassblowing

* forgot this
2021-09-26 00:30:00 +01:00
SkyratBot 99eb18f273 [MIRROR] Fixes the telescopic riot shield's weight class when extended (+ shortens shield balloon alerts) (#8397)
* Fixes the telescopic riot shield's weight class when extended (+ shortens shield balloon alerts) (#61643)

Makes the telescopic riot shield bulky when active as it was prior to refactor.
Also shortens the balloon alerts for the shields while i'm here on mothblock's request.

(no gbp here)

* Fixes the telescopic riot shield's weight class when extended (+ shortens shield balloon alerts)

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
2021-09-25 14:40:58 +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