Commit Graph

5370 Commits

Author SHA1 Message Date
RaveRadbury
8e4e34127b Sorts quirks into medical record categories (#50647)
* Sorts quirks into medical record categories

Removes Allergens from med record, still need to squash a bug.

* Makes Rohesie's requested changes

* typo

* Replaces magic numbers with defines
2020-05-01 04:47:26 -03:00
RaveRadbury
fe07831710 Changes ishuman to specify basic humans (#50787) 2020-05-01 03:11:23 -03:00
RaveRadbury
fae34292a7 Foreigner Quirk, Adds Galactic Uncommon (#50701)
* Adds Foreigner Quirk

Blocks Galactic Common

* Exceptions for species without secondary languages.

Adds beachtongue for humans and felinids

* Adds Galactic Uncommon

* Adds uncommon include into the .dme

Gotta tick that box
2020-04-30 21:38:46 -03:00
nightred
366ac6d225 Fixed Typepath 2020-04-29 19:09:42 -05:00
Iamgoofball
a3aa69701a [READY] Basically, Instant Explosions 2: The Search For More Money: Eternal: A Tail Of Two Kitties: 33 1/3 (#50594)
About The Pull Request

Extools maptick stuff is in the game. Stolen from BeeStation/BeeStation-Hornet#1119, improves performance. Requires ex-tools on the server, though.

Explosions have been refactored to do the actual exploding in a subsystem.

Credit to goon.

Here's some videos!

Why It's Good For The Game
Basically instant max-caps now.
We can now give more of a tick over to the sending of map updates

Changelog

cl Goonstation Coders, Beestation, Extools devs
refactor: Explosions have been heavily optimized.
/cl
2020-04-30 10:27:53 +12:00
William Wallace
ecdf74a329 phobias use less regular expressions and don't instantiate them all the time (#50631)
* individual phobia types now use a single regex that is cached

* move suffix out of phobia class
2020-04-26 19:54:21 +08:00
RaveRadbury
30444ee210 Fixes phobia issue, tweaks some phobia triggers (#50630)
Fixes phobia issue, tweaks some phobia triggers
2020-04-25 16:56:07 -07:00
itseasytosee
daf2e48c17 Clowns now require their shoes to slip people while laying down (#50650)
* powerclown

* Fix

* To chat

* You displease me

* Great

* awsum

* Update code/datums/components/slippery.dm

Co-Authored-By: JJRcop <jrubcop@gmail.com>

Co-authored-by: JJRcop <jrubcop@gmail.com>
2020-04-25 15:43:35 -04:00
Bobbahbrown
6578479184 [READY] Runechat: 'Runescape-like' Chat Message Overlays (It's back!) (#50608)
* first-version

* let's do those recommendations first

* color moment

* reorganization, prefs

* certified layer moment

* virtual speakers BEGONNE

* remove naughty bits, better sizing

* gimme the message mode

* rename that pesky pref and hide chat bubbles

* exponential decay moment

* async moment

* fixes

* fixes

* the players have decided they don't want to hear themselves on radio

* Fix bug with holograms incorrectly rendering messages

* rohesie's suggestion

* Color tweaks

* hallucinating now shows message properly

* pref moment

* updates

* rohesie's suggestions

* fix moment number 5

* less smelly more epic

* unfix the fixes and refix them

* a conscious change

* return of the prefs
2020-04-25 15:48:10 -03:00
uomo
4ec97b0c26 Cats now pounce. (#50521) 2020-04-25 00:59:23 -03:00
Aleksej Komarov
b8edd9cddd Fix MalfunctionModulePicker (#50665) 2020-04-24 23:45:35 -03:00
Kyle Spier-Swenson
9f10dbdbff Adds hub status to topic. (#50648)
self explanatory
2020-04-25 13:20:42 +12:00
zxaber
1a5540723f Borgs can no longer be synced to AIs on other Z levels (#50609)
* please check your connection and try again

* please check your EOF and try again

* forgot this one
2020-04-24 22:30:24 +08:00
RaveRadbury
4eb77bd0b5 Fan Hud (#50649)
* Should be ready to test

The compiler is throwing a tantrum so I'm committing here to debug.

* Merges hud.dmi with upstream

* adjustments

fixes some typos, adds a blank hud image for fanpinless crew

* It builds

* runtimes

it doesn't actually work yet, just compiles

* Progress

More runtimes removed

* It all works, runtimes sorted

pins made to not go above suit

* Update code/game/data_huds.dm

Adds Rohesie's suggestion

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Makes requested change

Thanks Rohesie!

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Makes requested changes

Thank you Rohesie!

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-24 00:10:00 -03:00
Fikou
4230492e77 adds the improvised pickaxe (#50534) 2020-04-23 18:47:48 -03:00
EOBGames
3bacd3ed9a emergency cruise ship (#50482)
man this is luxurious
2020-04-24 01:02:23 +08:00
spookydonut
98c77a828a Merge pull request #50519 from optimumtact/panikbunker
Adds panic bunker config to the world status topic
2020-04-24 00:57:57 +08:00
spookydonut
72617ed483 Who roped me into this. (#50537) 2020-04-24 00:51:57 +08:00
Ghilker
9532dbd2a8 Hydrogen Gas (#50510)
* new PR no tgui bundle build yet

* tgui bundle built

* atmos.dmi conflict fix 2

* balancing

* tgui bundle fix
2020-04-20 14:47:22 -03:00
Aleksej Komarov
2979838c38 Fixes, Reworks, New Tabs and General Misery 2020-04-19 19:38:55 +03:00
actioninja
158e70df99 remove deprecated style var 2020-04-19 19:36:40 +03:00
actioninja
b5dfd8880d id to component name 2020-04-19 19:36:35 +03:00
Mickyan
03186bf3c2 botanist heirloom fix (#50481) 2020-04-19 15:49:23 +08:00
ArcaneMusic
68689af002 Who roped me into this. 2020-04-18 10:26:47 -04:00
EgorDinamit
3dc4ae7bc7 [Ready] Forgottenship Ruin - rebalance, config update, uplink item. (#50529)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update code/modules/ruins/spaceruin_code/forgottenship.dm

Co-Authored-By: TiviPlus <57223640+TiviPlus@users.noreply.github.com>

* Lowered Cybersun hardsuit armour values.

* Upgrading energy armour value.

* Now captain isn't male-only.

* Turrets

shot_delay changed from 0.8 seconds to 1.0 second.

* Adds 3 encryption keys for cyborgs and AIs to use

* Syndi-captain gets loud-voice headset.

* Policy config

* Define space syndies

* Added Robotics access for syndies

It's really useful for when they create cyborgs.

* Adds special version of medivend instead of normal one

* Replaces basic syndi-vend with special one

* Update forgottenship.dm

* Cybersun hardsuit doesn't slow you down as said in uplink desc.

* NPC + Area sounds.

Elite Assault Officer projectile sound changed from pulse.ogg to laser.ogg.
Added ambient sounds for all areas.

* Good day sir

Lowered the amount of ores you get.

* assignedrole

Let admins know that this particular shitter is the cybersun captain!

* Weight'n'Cost of ruins fixed in another PR

* Update code/modules/uplink/uplink_items.dm

Co-Authored-By: Bobbahbrown <bobbahbrown@gmail.com>

* Cost/Weight of ALL space ruins changed

* Thanks to fikou

* Only cap's spawner leaves empty-sleeper now

* if(policy)

* Revert "Cost/Weight of ALL space ruins changed"

This reverts commit fa343547f0dcf225710895f50ac2bbf32dc07b5d.

* Fixup

* Minor fix in attempt to fix some stuff

* Update code/modules/ruins/spaceruin_code/forgottenship.dm

Thanks trollbreeder.

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* Update code/modules/ruins/spaceruin_code/forgottenship.dm

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* [Grammar] THE captain!

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* grammar review man

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* "A" vs "The"

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* [Grammar] "an"

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

* Update uplink_items.dm

* Update code/modules/ruins/spaceruin_code/forgottenship.dm

Co-Authored-By: trollbreeder <trollbreeder@users.noreply.github.com>

Co-authored-by: TiviPlus <57223640+TiviPlus@users.noreply.github.com>
Co-authored-by: Bobbahbrown <bobbahbrown@gmail.com>
Co-authored-by: AnturK <AnturK@users.noreply.github.com>
Co-authored-by: trollbreeder <trollbreeder@users.noreply.github.com>
2020-04-18 11:16:27 +02:00
oranges
a50a192d47 Adds panic bunker config to the world status topic 2020-04-17 23:43:33 +00:00
Timberpoes
20466d7d2a Change Wacky mutation description to not contain HTML. (#50479)
Fixes #50474

With new technology comes the necessary sacrifice to make our new age.
2020-04-18 11:16:58 +12:00
Mickyan
7e7bfcc7a1 Fixes explosions damaging the contents of atoms with the PREVENT_CONTENTS_EXPLOSION_1 flag (#50397)
Fixes #49986
Fixes #49232

🆑
fix: Being at the epicenter of explosions no longer damage the contents of storage that is meant to prevent it (most commonly photos inside photo albums)
/🆑
2020-04-18 11:02:39 +12:00
Kyle Spier-Swenson
8cddfcdef0 Adds format=json support to world/topic (#50446)
random fact: the original game banners from erro used a custom url decoder. It wasn't until a year or two in to me being host that i caught on and fixed this.
2020-04-18 11:01:20 +12:00
Akrilla
8b69eba77c Equipment Swapping (#50294)
About The Pull Request

Adds a new hotkey, defaulted to V, which allows for swapping out equipment after a small delay. After the delay, you'll equip the currently held item into it's most preferred slot, and swapping out what was worn/equipped currently. This also allows for swapping out jumpsuits without dropping your pocket contents, belt, etc.
Why It's Good For The Game

QoL change that feels intuitive, and helps equipping feel more fluid.
Changelog

🆑
add: Equipment swapping, defaulted to V. Allows you to equip items while swapping out what you're already wearing after a small delay.
/🆑
2020-04-17 20:33:05 +12:00
spookydonut
8dbf1cf4ec Changes to comply with GitHub TOS
Further changes to comply with the ToS

More ToS cleanup

Bye bye George Melons

Better to be safe than sorry
2020-04-14 21:24:50 +00:00
Rohesie
0738549b5b Client loss on Login() handling (#50073)
The client variable can be nulled at any point between proc calls during Login(), at the very least between parent calls for sure. That can produce dirty additions to mob lists among other less problematic runtimes.
This attempts to handle it.
2020-04-07 08:13:38 +12:00
necromanceranne
09831566b2 Bags of Holding: Rarity Edition (#50290)
* Bags of holding require a bluespace anomaly to create.

* now it uses a recipe aw ye
2020-04-06 15:58:47 -04:00
Timberpoes
bf6039215e tgui: DNA Console Overhaul Project (#50225)
* Initial work on tgui conversion for DNA Consoles

* Some initial button logic complete

TODO: Scanner Open button should disable while scanner is locked
TODO: Scramble DNA should disable while on cooldown

* Tabs for the tab God

* Dropdown changes, genetic sequencer modifications

* Mutation and genetic sequencer functionality

Almost complete. Need to implement Advanced Injectors still.

* Mostly done, converted most of genetic makeup code

* Tactical pocket linting

* More changes

* Everything except advanced injectors complete

* First complete alpha version

* Fixed debug/testing change

* Removal of more debugging code

* Fix pulse bug

* Bugbusters

* Fix for accidental changes

* Fix broken genetics disk changes, fix list of lists

* Squash tgui tab-key bugs and clean up attackby

* Code documenting, refactoring, bugfixing, spellcheck

* Documentation and misc bug squashes and runtime error fixes

* Fixes, features and tweaks

* Special check for those who have shuffled off this mortal coil

* New interface concept for console storage

* Mini code refactor

* Massive refactoring of DnaConsole interface (WIP)

- De-spaghettifying of LawyerCode
- Fixed the flex-basis bug, and removed ForcedBox since it's no
longer needed.
- Added a Divider component.

* Implemented requested changes.

Removed list() versions of strings.
Removed used TGUI-exclusive constants from data object. Currently unused ones still remain, can be removed if they're no longer necessary.
Fixed other DM data structures to serialise as JS Arrays instead of Objects.
Minor TGUI logic fixes for various edge cases.
Added some comments in DnaConsole.js outlining some minor notes and TODOs.

* Fixes "Save to X" being disabled.

* Included 2px outline CSS

* Additional minor logic patches

Don't want certain buttons active unless the mutation relation to them is also active

* Makes these transforms use a timer

* Fixed transformation race condition and stuff.

* Mutation source defined in DM. Conditional formatting improvements.

* Custom cache directory with BYOND_CACHE env var

* Fix gene cycler on index of -1

* Framework and TODO for next interface element. Cleared TODO list a bit.

* Fix 1px shift in gene cycle buttons

* Pass raw event with GeneCycler

* More robust combining logic

* Fix some cycler bugs, start working on enzymes

* Conditional highlighting for unsolved mutations and X'd genes.

* Lint for the Lint God

* Enzyme UI and more refactoring incoming

* Finish tgui refactoring, enzymes injectors done

* Whack-a-Bug

* Unlinted. Advanced injectors moved and improved. Implemented disk genetic data readout.

* Partial linting

* Assorted bug fixes

* Remove debugging code

* DNA Consoles are now more conversational. Initial state set.

* Final tweaks, implemented mutation combining, complete?

* Fixes tooltop, re-enables delayed enzyme transfer, cleans up some data params

* 10 Fix a bug, 20 make a bug, 30 goto 10

* The definition of irony

* Don't drink and derive, kids || How I learned to stop coding while drunk and rely on stylemistake to Flex on my formatting.

* uniqBy

* Add support for dropdowns with disabilities.

* Cleanup

* Remove current mutation from combinations

* Dividing

* Document BYOND_CACHE env var

* Outline cleanup

* Declare radiation constants since they were removed in DM

* Combine mutations only after checking for null

* Advanced Injectors actually work now.

* Comment cleanup, DMDOC, stard and end processing at appropriate times

* Pressing Ctrl-S occasionally helps things

* Fix enzyme mutator timeout bug, added injector timeout display.

* Rebuild tgui

* Rebuild tgui

Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
Co-authored-by: spookydonut <github@spooksoftware.com>
2020-04-06 19:00:19 +03:00
spookydonut
de996f7cc3 Merge pull request #50388 from necromanceranne/scarp_cleanup
Just some small fixes for scarp
2020-04-06 17:52:47 +08:00
necromanceranne
587edddf82 yeeeeep
Co-Authored-By: spookydonut <github@spooksoftware.com>
2020-04-06 19:42:07 +10:00
spookydonut
5cb83ce64e Merge pull request #50401 from Mickyan/curtain_opaque
Makes certain curtains block your view when closed, new curtain type
2020-04-06 16:52:36 +08:00
cacogen
6298203cf0 Material wall/floor and floor tile name/desc changes (#50203)
* Renames material "plating" to floor, changes material wall desc to match regular walls

* floor tile

* Custom descs for walls and floor tiles based on material

* material tile throwforce 1 -> 5

* switch order of material flags on material tile

* Removes material flag and check

- Simplifies floor tile desc throwforce check

* Moves the throwforce message to examine()

* Gives more nuance to tile throwforce examine() messages

* Simplifies tile examine throwforce code

- Fixes problem with radioactive item examine of outputting a single period when too far away
- Adds spans to tile throwforce examine and radioactive item examine

* logic 10

Co-Authored-By: Rohesie <rohesie@gmail.com>

* Adds throwforce message to examine return

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-05 21:31:42 -03:00
Ghilker
5d64a90618 Hot ice fix (#50353)
* fixed the burning oh the sheets

* finish touches

* properly fixes the hot ice component

* runtimes are bad

* Update code/game/objects/obj_defense.dm

Co-Authored-By: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-04-05 21:06:45 -03:00
Ryll Ryll
49970407fa Buffs the circle game, adds an achievement (#50145)
About The Pull Request

Examining someone holding a circled hand from using the *circle emote while next to them can now alert said person, and if you don't act fast, they'll bop you! You'll have a split second to move away before this happens. Losing the circle game to a hulk will result in a very forceful bop.

Bopping someone will award an achievement, "HA, GOTTEM"

Also adds COMSIG_PARENT_EXAMINE to carbon and human's examines, cause they never had that set, and adds TRAIT_HULK to being hulk since I forgot to actually give it its own trait when I added said trait in another PR
Why It's Good For The Game

Enhances pranking. It's honestly amazing to me that this functionality wasn't built in when this was first made.
Changelog

cl Ryll/Shaps
add: The *circle emote now has additional functionality! Go prank your friends!
/cl
2020-04-06 10:12:08 +12:00
Mickyan
218dc6f6af crafting 2020-04-05 15:36:39 +02:00
Cruix
e129b731ed Bug fixes (#50334)
* Fixed pointing runtime

* Fixed runtime allowing abductors to speak out loud

* Fixed being able to get two monkeys from each monkey cube

* Fixed being able to use camera consoles with the mech teleporter to teleport further than intended

* Fixed ninja suit never copying data from tech disk

* Fixed being able to tackle things not on a turf

* Rearranged ifs
2020-04-04 12:34:08 -07:00
necromanceranne
3fedf555b4 Sorry, what kind of damage? 2020-04-04 23:29:18 +11:00
necromanceranne
2fe521e99b "You chops Mcgreyshit" 2020-04-04 23:26:38 +11:00
necromanceranne
6a7f06b418 Just fixes some funky shit 2020-04-04 23:21:55 +11:00
Ryll Ryll
5c174800fb Grenades and projectiles can have shrapnel and embed, all carbons can suffer embeds, some bullets can ricochet, sizable refactor of embedding (#49634)
About The Pull Request

It annoyed me that we have a perfectly good frag grenade item, and a perfectly good shrapnel component, but no crossover episode between the two. This remedies that, and does a lot, lot more.

dreamseeker_2020-03-30_05-01-13.png

dreamseeker_2020-03-30_05-01-26.png

Big points:

    Adds new component: pellet_cloud, which can be used by ammo casings, guns, and landmines to spray shrapnel and display aggregate hit messages ("You're hit by 6 buckshot pellets!" vs "You're hit by the buckshot pellet in the X" x6). All gun ammo that shoot multiple pellets now use this component on firing.
    Adds stingbangs, premium less-lethal grenades that shoot off lots of stinger pellets, to cargo. Frag grenades are also reworked to have smaller booms, but shoot off lots of shrapnel shards. You can jump on top of these grenades to absorb a portion of the shrapnel to save those around you! There's an achievement for dying this way, called "Look Out, Sir!"
    Projectiles can now embed items/shrapnel. Adds .38 DumDum ammo to cargo that does less damage and has negative armor pen, but can embed in people. This is the only ammo that currently embeds.
    Bullets can now ricochet off walls, structures, and machinery (harder surfaces are more likely to ricochet). Only standard .38 and Match Grade .38/.357/L6 ammo can ricochet, with Match Grade being much better at ricocheting. You can buy Match Grade .38 from cargo and Match Grade L6 ammo from the nuke uplink, while Match .357 is admin only.
    Armor now protects you from harmful embeds, taking the better of the bullet/bomb armor on the affected limb. Armor penetration can modify this of course, and many blunt embeds like stingbangs and DumDum bullets are significantly worse if you have even 1 armor.

Other misc fixes/changes

    Refactored the embed element a bunch and fixed it creating new elements for every instance rather than expected bespoke behavior. There are new /obj/item helpers for modifying and adding embedding.
    Fixes #49989: Spears can no longer embed in turfs cause their sprite is annoying to me, it's generally harder for most things to embed in turfs
    Fixes #49741: New carbon helpers for removing embedded objects
    Fixes #46416: Handles embedded objects getting qdel'd or moved while embedded
    Renamed the old shrapnel component for RPG loot to MIRV to avoid confusion
    Repathed frag grenades from under minibombs to under base grenades, and added explosion vars to base grenades

Why It's Good For The Game

Fixes a bunch of janky design with embeds, adds lots of new avenues for projectile and grenade variety, ricochets and collateral damage are fun!
Changelog

🆑 Ryll/Shaps
add: Adds stingbangs to cargo (and one in the sec vendor premium), premium less-lethal grenades that shoot off a giant swarm of stingball pellets to help incapacitate swarms of people in tight quarters. You can jump on top of a live one to be a hero and absorb a bunch of shrapnel, same with frag grenades. There's even an achievement for dying to a grenade you jumped on!
add: Projectiles can now embed in people! Or at least grenade shrapnel and the new .38 DumDum ammo, now available in cargo, can. DumDum rounds excel against unarmored targets, but are pricey and do poorly against armored targets.
add: Bullets can now ricochet! Or at least, standard .38 and the new .38/L6 Match Grade ammo can. Match Grade ammo is finely tuned to ricochet easier and seek targets off bounces better, and can be purchased from cargo (for the .38) or nuke ops uplink (for the L6), but standard .38 ammo has a chance to ricochet as well.
tweak: Frag grenades now have smaller explosions but shoot off a bunch of devastating shrapnel, excellent for soft targets!
tweak: Shotguns and other multi-pellet guns now print aggregate messages, so you'll get one "You've been hit by 6 buckshot pellets!" rather than 6 "You've been hit by the buckshot pellet in the X!" messages. Bye bye lag!
balance: Armor can now protect against embedding weapons, taking the best of either the bullet or bomb armor for the limb in question away from the embed chance. Some weapons are better at piercing armor than others!
/🆑
2020-04-03 16:58:38 +13:00
EOBGames
6653315d22 Codename Cheesy Goodness: New Material Datums (#49941)
About The Pull Request

Adds a slew of new material datums. Included are bronze, runed metal, sand (made from sand blocks, made by using sand on a sink), sandstone, snow, paper, cardboard, bone and bamboo. Oh, and pizza. Yes, pizza.
newmats
(from left to right: bronze, sandstone, sand, snow, bamboo, paper, cardboard, runed metal, and bone).

PIZZA
PIZZA!
Pizza is a special case: it's edible, and to craft it, you need pepperoni sheetzzas. These are made by using a rolling pin on a pizza slice.
Why It's Good For The Game

More mats datumised, and pizza is a good meme.
Changelog

🆑 EOBGames (Inept)
add: A whole bunch of materials are now datumised! Check out bronze, runed metal, sand, sandstone, snow, paper, cardboard, bone and bamboo. Oh, and pizza. Yes, pizza.
/🆑
2020-04-03 16:57:31 +13:00
Ryll Ryll
6ece69d358 Adds a minimum drinking/smoking age (#49990)
About The Pull Request

NT is finally cracking down on underage drinking and smoking on its stations, and you must now be at least 20 years old in order to purchase alcohol or tobacco at vendors. Underage ID's will be visible as such when shown or inspected. Bartenders below the age have discreetly had their IDs modified to be the minimum age, though if anyone cross references the station datacore records, they'll be exposed!

dreamseeker_2020-03-31_05-04-22.png

You can adjust the registered age for an ID at the HoP's console, the same way you would adjust the registered name. You can also pulse the age restriction wire on vending machines to disable the age checking system if you want to hack the system. I chose 20 as the legal limit because I don't care to listen to people fighting about 21 vs 18 and America vs the world, and it still will affect a decent amount of people I figure.

2020-03-15_21-40-54.png
Why It's Good For The Game

Makes age a teeny bit relevant, you can now more easily identify and bully 17 year old Heads of Staff.
Changelog

🆑 Ryll/Shaps
add: Due to pressure from various organizations, Nanotrasen is implementing a new ban on the purchase of alcohol and tobacco products for crewmembers under the age of 20 onboard its Spinward space stations. Please remember that providing alcohol or tobacco products to underage crewmembers is against Space Law, and remember to check those cards bartenders!
add: Standard Nanotrasen IDs now display the registered age of the holder, which you can change at the HoP's access console.
/🆑
2020-04-03 16:46:47 +13:00
Time-Green
0e0b50045a fixes plumbing rotation truly finally (#50352) 2020-04-02 18:52:34 -04:00
trollbreeder
dfda25ff4f [Please review me] Operation: Funky Nostaligia 2. Changes charliestation medkit icon, and changes heirloom item for MDs to an old medkit. (#50210)
* Operation: Funky Nostaligia 2

the last one failed because i'm a clown

* Fix typo in icon state

Please dont kill me if this causes merge conflix because this happened the last time i tried doing this

* GET THE HELL OUT, MERGE CONFLICTS
2020-04-01 18:06:59 -03:00