* Christmas in Summer Time
* Bar Christmas Tree
* Mapmerge Fix?
* What is going on with the Surface file
* Merge fix?
* present tweaks
* Final tweaks
* updated cl
Co-authored-by: Ferner <nikferni@gmail.com>
this resprites some weapons,
namely the butterfly knife and switchblade to not be comically oversized
(you know, they're...concealable.)
tweaks some other sprites too, like the handles of polearms and the stunbaton
this doesn't change how they look from afar, they're practically the same in glance value
riot shield taken from Eris (and tactical shield is a modified version of that)
made ebarrier use same colors as eshield (this makes more sense, honestly)
Refactors objects.dmi and items.dmi
Adds some more uses to glass jar - now you can use it as a tip jar AND a reagent container!
you can also see reagents inside like a beaker
also improves sprites for wrapping paper and the pocketwatch
This basically makes it easier for future sprite improvements
In summary:
changes path of beartrap to make it a generic trap
Updated paths everywhere
Adds small trap, can capture mice, lizards, chick and spiderlings.
Adds medium trap, can capture cat, diyaab, monkey, yithian, pengiuns, chicken, nymph. Sometimes even maintainence drones, spiderbots and PAi.
Adds large trap, that is dense object. It cannot be picked up and releases animal in the opposite direction from a user. It can capture: medium size animals like dog, spider, carp, goat, cow, shark, fox, bear, cavern dwellers, and other kinds of Xenomorphs.
Adds medium trap, can capture Medium-sized mobs such as Diyaabs, Cats, Monkeys, Yithians(?), Nymphs, the occasional wandering pAI and Maintenance Drones.
Fixed the battlemonster coin not having a sprite. (Unreported)
Fixed legendary battlemonster cards not appearing in vendors. (Unreported)
Fixed new battlemonster decks incorrectly displaying 0 cards. (Unreported)
Fixes#5212
Fixed potential powernet issue with surface by removing redundant wires.
Overview
Adds Battle Monster cards. Battle Monsters is a collectable card game clone like Yugioh or magic the gathering. Players can purchase card packs and use them in games with actual rules to them.
Checklist
Card Generation Framework: 100%
Sprites: 80%
Game Rules: 90%
Deck Framework: 5%
Monster Cards: 20%
Spell/Trap Cards: 5%
Obtainable Status: 0%
Reworked how slipping on tiles work. If there is too much lube/water on one tile, it will spread to all adjacent tiles.
Fixed a potential bug where spilling copious amounts of water on a tile will turn it to ice.
Containers are much more saner now. They all share a standard system, unless specified.
You can drink from any open holdable container using help intent. You can splash the contents of the container on anything via harm intent.
Sinks are more saner, you can refill or empty them easier with various refill amounts.
Removed silly exclusive cyborg limb checking for hyposprays.
Added a new chemsprayer, the "Xenoblaster" which is a significantly weaker chem sprayer. Two can be found in xenobiology.
Large reagent containers (beer kegs, water tanks, fuel tanks) now share a system together. Both can leak their reagents via harm intent with a wrench, and bother can accept any sort of reagent, with exception to the fuel tank.
Large reagent container leaking happens over time as opposed to just leaking every time it moves.
New chemical, Monoammonium phosphate. Monoammonium phosphate is a fertilizer and also a potent fire extinguishing and preventing chemical. It can be made with 1 part ammonia, 1 part sulfuric acid, 1 part sodium, 1 part phosphorus.
All extinguishers now have monoammonium phosphate in them instead of water.
Extinguishers can hold any reagent, however they must be filled using an extinguisher refiller cartridge. These can be ordered or found in atmospherics.
Nerfed the extinguisher range so it only sprays in a 3x3 radius.
Mini-extinguishers spray in a 1x1 radius.
Adds Monoammonium phosphate containers across the station.
Most watertanks are replaced with Monoammonium phosphate containers.
This PR removes brain surgery's ability to instantly cure all traumas. Now traumas have been roughly divided into four categories of treatment:
1: Chakra therapy cures traumas that directly affect physical behavior, such as tourettes or paralysis. It is accomplished via the crystal therapy pod available to the psychiatrist.
2: Hypnotic therapy cures traumas that directly affect mental behavior, such as phobias or confusions. It is accomplished via the mesmetron pocketwatch available to the psychiatrist.
3: Isolation therapy cures traumas that cause hallucinations. It is accomplished via the metronome and facilitated by the isolation room available to the psychiatrist.
4: Surgical therapy cures traumas that do not fit into the above categories. It is accomplished via brain surgery.
Using the crystal therapy pod's neural scan function will provide the psychiatrist the brain damage the patient suffers from in numerical form. It falls upon the psychiatrist to determine how much of this brain damage is being caused by mental traumas the crystal therapy pod is equipped to deal with. Excessive cycles will cause increasing amounts of radiation damage.
The mesmetron pocketwatch requires the patient to believe in hypnosis. It then puts the patient into a slumber, where the psychiatrist can hypnotically suggest new behavior, provided the patient continues to believe in hypnosis. Each suggestion cures a single hypnotic trauma.
The isolation room is equipped with a metronome. When active, the metronome will have a chance every ticktock of the metronome to cure an isolation trauma, provided the patient is totally alone.
The psychiatry office has been expanded into a complete mental health ward. The only thing it is lacking is beds, as I believe recovering mental health patients still belong in the recovery ward.
The chaplain can also cure isolation and chakra traumas by dispelling the demons within with his null rod. Staring at the supermatter unprotected has been known to hypnotize. Electricity applied by any source directly to the head is also known to sometimes cure electroshock trauma.
-adds support to material clothing, already used by rings and makeshift weapon
-adds makeshift armor that you can craft using buckets for helmets and material sheets to make the plates
-adds a wooden bucket that can be crafted using planks also ported from polaris
-adds icon_has_variants to some sheets, adding sprites to them from tg
-fixes bronze being just a place holder
-adds sheet types to bronze and titanium
Makes all light tubes & bulbs have colour according to the light they emit. There are 6 preset colours: RGB CMY. Any other color is possible by simply changing the already present brightness_color variable. This PR makes it so it actually changes the color of the item and wall object too.
Added two new colour defines used only along with preset coloured lights.
Coloured lights are only obtainable by random maintenace loot, cargo spawn or trader.
Added box of randomly mixed light colours and box for every preset light colour.
Removed two sets of redundant defines.
Converted light item New() to Initialize() (hopefully correctly).
Made couple tiny tweaks to the lights code.
EDIT, 7. Oct 2017:
When you hit light machinery or item with paint, it will change it's brightness_color var, instead of the color var.
Paint buckets can now paint items and people again.
You can now wash paint off by spraying yourself with fire extinguisher or otherwise covering yourself in water.
EDIT, 8. Oct 2017:
Removed one apparently unused global list.
Converted pain bucket New to Initialize and changed it's pathing style.
Shower can now wash paint too.
Fixed paint bucket sprites to be bit more dynamic and fixed the in hand sprite. Also added bucket lid.
Top is a stack over 2/3 full, middle is between 1/3 and 2/3 full, bottom is under 1/3 full.
Also converted stacks to use Initialize().
affected stacks:
Ointment
Bandages
Steel Sheets
Plastic Sheets
Glass Sheets
Plasteel Sheets
Reinforced Glass Sheets
Leather
Wet Leather
Hide
Sprites from /tg/.
-turn some custom items into regular ones, their original owners will keep their more snowflake version, at tishina's request due to this new policy: https://forums.aurorastation.org/viewtopic.php?f=25&t=8087
-fix the mercenary's voidsuit and the radsuit having exposed hands in their mob sprites
-fix the iaa rig having no sprite when deployed
-adds flannel shirts/jackets that strudel was asking me for months
-adds a medical webbing and drop pouches versions of the webbings
-brings back the IAC armband from old code
-adds pink lipstick
When the update goes into master, I will make another pr fixing the custom item paths and etc.
Due to admin's decision, the station nuke is being replaced with a terminal. Pretty much porting this from the newest bay dev branch.
Other changes:
fix a messed up syndie borg sound
fixes#1308
Credits for content go to Serveris. All I did was fix it up for the baymerge and got it working in-game (Yes I know zipties don't stack. I couldn't figure it out. Maybe latter.)
Changes:
returned heavy flashlights from old code, some in security, eva storage and engineering
added robust maglights, placed some in security
ported glowsticks from polaris
cameras, recorders and some old code items sprites are being re-added
you can now carry flashlights into your armor
you can now carry wizard related items into the wizard robe and voidsuit
you can now carry chaplain related items into the chaplain hoodie and nun robes
you can now carry chaplain related items into the chaplain hoodie and nun robes
cult hoods now share the same armor values as the robes
Overhauls the contained sprites system to be feature complete in terms of what it can do and offers. Now almost all cases of clothing and other items may use the system properly.
Adds sorting to the custom gear menu list.
Adds the white cheongsam as a custom gear item.
Moves the purple comb out of the custom item defines as it is no longer
just a custom item.
Adds pockets to the bomber jacket.
Reduces the cost of ponchos to 3.
FearTheGabby
