454 Commits

Author SHA1 Message Date
TheFurryFeline f2bd35f46a LET THE PLUSHIES LIVE
Changes icon states for mouse plushies to NOT be resembling dead mice. :C
2019-10-03 01:11:41 -04:00
kcin2001 92c266c7e4 COPYPASTA! (fixed copypasta error) 2019-06-12 22:54:38 -07:00
kcin2001 1c95fb840e adds slime reagant,implant and metaglas sprite 2019-06-12 22:39:20 -07:00
TheFurryFeline 58c0cc5c56 Honey Reagent Implant
Requested item for the loadout. Enjoy!
2019-05-07 18:05:09 -04:00
Hiziaan 83034ac661 Merge pull request #655 from TheFurryFeline/TFF-Reagent_Implants_Loadout
Reagent Implants Loadout
2019-04-30 14:59:24 -05:00
TheFurryFeline 649a79c8f6 Loadout-Specific Reagent Implanters
Add basic reagent implanters for the loadout to select.
2019-04-30 15:02:57 -04:00
Hiziaan 3f7e5d071d Merge pull request #653 from kcin2001/New_Clothes
Adds 3 new pieces of clothing
2019-04-26 01:19:53 -05:00
kcin2001 74ba41b8b9 Adds 3 new pieces of clothing 2019-04-25 22:41:04 -07:00
Mack 4fb786ffe0 Add files via upload 2019-04-19 23:43:56 -04:00
Mack 49328a9c9b Adding Teleport Cane
For the stylish Technomancer
2019-04-17 23:46:51 -04:00
Nadyr 7d7d0cb058 Life crystal is now a Vey-Med product. 2019-03-14 18:38:10 -05:00
Nadyr 3db8bb46d5 KHI guns (Protector, NSFW, Hunter-Capture) now made by Hesphaistos Industries. 2019-03-14 18:15:18 -05:00
Nadyr f1d1649446 Missed a KHI reference due to not realizing CTRL+F is case sensitive. 2019-03-14 18:01:30 -05:00
Nadyr 54170fa2a5 Renames uniforms from "KHI" tp "GE," canonically come from Gilthari Exports now.
Also renames Aronai's fluff rig from 'KHI' to 'VM' to reflect it being from Vey-Med now.
-Also replaces 'khi' with 'ge' in the item paths.
2019-03-14 17:48:54 -05:00
Sharkmare 4e0efff31d Update custom_permits_vr.dm 2019-02-21 07:45:37 +01:00
TheFurryFeline 7e909c22d1 Commas, Commas, Commas
Silly, simple mistake for the list of items. Here you go, Taaa!
2019-02-05 23:50:40 -05:00
TheFurryFeline 1e47fe9c37 Taaa's Medals
Adds medals for Taaa
2019-02-05 23:29:40 -05:00
TheFurryFeline d7d2e63019 Fluff Item Additions
Medal of Valour for Kassc and Keith, each.
2019-02-05 16:31:05 -05:00
IgnusVam 5c68e9685c Big changes DO NOT PUSH TO LIVE YET
- De-christmases the map
- Fixes the silly plush
- Adds a medical outpost, areas need textures
- Adds a medical shuttle, needs serious work, currently nonfunctional.
- Adds new stuff to the trade shuttle
- Tweaks the armory items
- Various other QOL improvements.
2019-01-17 16:50:28 -07:00
Jon ab60a12b38 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into DarkTheme 2018-12-22 14:46:19 +00:00
Jon 27c9225728 Also enables NIFs 2018-12-22 14:26:02 +00:00
AnonymousHybi 265780dda1 Merge pull request #227 from TomTyph/TomTyph-patch-1
Tom typh patch 1
2018-12-10 16:26:03 +00:00
TomTyph 7be37341d3 Fixes Black Iron
Fixes Black Iron lacking a sprite by giving it a proper entry as it's own item now rather than just a "reskin".
2018-12-10 04:51:19 -06:00
Jon f89af853fe Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into NIF-Test 2018-12-10 00:40:42 +00:00
Jon 13fa795f16 Temporary removal of NIFs :c 2018-12-10 00:07:39 +00:00
TomTyph 166fd3930d Add Sarika's Permit
Adds a permit for Sarika
2018-12-07 21:31:11 -06:00
IgnusVam b0734d5aa1 Big update
- Fixes spiders (I hope?) - Spiders now spawn in groups of 2-8, growing up should be fixed as well.
- Christmas-ifies all the maps
- Minor tweaks all around the stations
- Cleans up the map for central (a lot)
- Adds a new mob to the spawn list in the mines
- Fixes some minor shadekin issues
- Fixes it so borgs/AI can't understand gutter
- Modifies the timing of the radiation storm
- Hopefully fixes the cargo request event. No more buggy gas mixtures.
- Adds a flamboyant crate
- A bunch of other stuff.
2018-11-29 12:35:52 -07:00
IgnusVam 016f039e67 (hopefully) Fixes Antag commands to be usable by Event Managers.
Fixes a typo in the HASD armor set.
2018-09-18 20:28:42 -06:00
IgnusVam deba1a6869 Modifies HASD security voidsuit to be non-ckey restricted. 2018-07-31 12:19:40 -06:00
Reddeyfish 635013f331 Merge branch 'virgoMaster' into virgoPull 2018-06-10 12:33:29 -07:00
ArgobargSoup 8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
Unknown 994a81b6b6 Adds pumping sprite 2018-05-23 14:20:09 -04:00
Unknown 2c1ad0076f Requested Fixes 2018-05-22 12:49:41 -04:00
Unknown ca131caa10 New Explorer Gear
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
2018-05-22 11:27:48 -04:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Aronai Sieyes 86e413bf00 Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
Removes taur suits
2018-05-08 19:09:29 -04:00
InterroLouis dc299bdd3b Add files via upload 2018-05-07 20:24:32 -04:00
Arokha Sieyes c4cbe31199 Removes taur suits 2018-05-04 22:16:17 -04:00
Reddeyfish 1c1ab01a69 Merge branch 'virgoMaster' into virgoPull 2018-04-28 10:12:34 -07:00
Arokha Sieyes fb23176220 Adds a baby translocator for miners 2018-04-24 12:59:24 -04:00
HzDonut 980c9bea44 LeMat Fix
Argh
2018-04-23 09:28:33 -04:00
Aronai Sieyes fb7ca15439 Merge pull request #3477 from Mewchild/MC-Zaozao
Adds Zigfe's Fluff Item
2018-04-18 13:58:28 -04:00
Verkister 03ab2fef08 Updates sickshot description.
Also making it little more clear that the only way to get victims out of uncooperative or dead things is no longer live human exclusive.
2018-04-16 10:48:25 +03:00
Mewchild b08357a068 Got dang quotation mark 2018-04-15 17:22:21 -05:00
Mewchild 8b469c4ec7 Adds Zigfe's Fluff Item 2018-04-15 17:11:08 -05:00
Reddeyfish 0af8620ee1 Merge branch 'virgoMaster' into virgoPull 2018-04-15 11:06:40 -07:00
HzDonut 700c902d14 Modified LeMat Fluff Weapon (#3337)
* LeMat

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm

* Update custom_guns_vr.dm
2018-04-14 19:41:19 -04:00
Arokha Sieyes e9009507d8 Remove Aronai custom bag
Medical bags ARE blue now, I don't need a custom blue one, just the ID that came in it.
2018-04-13 20:21:25 -04:00
ReddeyfishVor 768887d85a Virgo merge (#107)
* Move pilot helmets from southern_cross to main files, they are used on multiple maps now.

* Ports export reports (#5051)

* Ports export reports

* Absolute pathing, small touchups

* remove both layers

* POLARIS: No string compare for assistants

* Make turf obfuscation lists lazy

* Improve two image cleanups

* POLARIS: zshadows should be as invisible as their origin

* POLARIS: Allow alteration of mob default see_invisible

* say() safety check on client

Spawn keeps it from destroying all say(), thankfully, but needs to be fixed.

* POLARIS: Reduce double admin logs

* POLARIS: Clean up adminpm logs

* POLARIS: Communicator small refactor

* POLARIS: UI Tweak involving species rarity

* POLARIS: Allow species-specific statpanels

* POLARIS: "0x32" is not a valid single-bit flag

* POLARIS: Lazylen species restricted list

* POLARIS: Prevent ghosts from ejecting borgs from rechargers

* POLARIS: Make borg recharger test more robust

* POLARIS: Another recharger fix

* Fix nif logs

* Removes some problematic HIDEJUMPSUIT flags

* Camera fix

* adds statue

* adds statue

* Revert "adds statue"

This reverts commit f1c9193797.

* POLARIS: Improve robot and typing overlays

* Change to Teshari to test for bug

Removing these, to see if they are related to the Teshari bug. These are the only two unique sprite features that I can see.

* Promethean tweaks (hunger, regen time)

* Xenoarch Multitool & Xenoarch Excavation Drill (#5058)

* Xenoarch Multitool & Xenoarch Excavation Drill

* Makes the tool work better

* Cuts down on lines & left comments

* change to m

* Ports antibiotics overhaul (#5050)

* Ports antibiotics overhaul

* Update the rest of the places "spaceacillin" is used where antibiotics is meant.

* Antibiotics port compiles

* Fixes the drone borg ID thing AGAIN. (#5080)

* Fixes the drone borg ID thing

* Updates tracking implant description

* Update tools_pickaxe_vr.dm

* Removes excavation drill

* Fixes default synth tails necessitating potentially harmful mystery delays in mannequin generation.
-Now get_tail_image() can check the owner's syntheticness without having to wait for something else to call it whenever/wherever the fuck it happens.

* Fixes missing pixel on human ass.

* Update update_icons_vr.dm

* absolute pathing

* added slashes. No idea for what, but I don't want anyone to ask me to do it because they have OCD

* Some size stuff for Proteans

* Removes a bunch of my unused fluff stuff

* fixed vale borg flashlight eye sprites

* Changes to objects random

- Fixed the icon_state for 'structure/plushie/carp' and the random first aid kit spawner
- Added a random chance tool spawn for power tools (most of the time it should still just be regular tools)
- Adjusted the spawn rate of medkits, combat medkits should be more rare
- Cash split into its own loot item
- Plushies split into large and small plushies
- All the extra plushie spawns added to the random plushie spawn
- Eightball and conch shell added to toy spawns
- Added spawn points for the large plushies, cash, and the power tools

* Removes an inconsistency in custom species code

This line had no real use at all. It may even have contributed to various issues.
All basic humanoid species have had their appearances constructed onto an existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant custom species icon_states would never have had any proper fallback.

* Re-establishes existing foundations for human icon

This line had no real use at all that I could find. It may even have contributed to various issues.
Before this line was added, all basic humanoid species have had their appearances constructed onto an actually existing blank 32x32 icon_state named and called for as "nothing" inside the effects.dmi.
There are no untitled blanks either inside the effects.dmi file, so the funky deviant species specific icon_states would never have had any proper fallback either.

No negative effects whatsoever detected in testing runs. Maybe slight framerate increase, but that was likely unrelated/placebo lmao

* Couple security otie fixes

-Fixes sec oties failing to announce arrests for sec comms.
-Adds another announcement for sec oties to confirm successfully detained crimester.

* Fixes custom accessories not showing up on things

Contradictory hardcoding babe.

* Fixes inconsistencies in organ system
-Seems the years old conversion to turn old limb names and tags and such to BP constants was never finished.
-This also fixes warning spammy diona organ tags.

* Balance pass on custom species traits

* Revert "Fixes cameras making completely black photos"

* Fixes handheld cameras

* Resh - Navy HoS Jacket

https://forum.vore-station.net/viewtopic.php?f=27&t=1065 - approved fluff app. Long time coming, lol.

(And first time 'coding'/using github to change files. hope I did it right. Oof.)

* Increase prom limb health by 60%

* changes hairstyles to use species defines

* Correct Resh custom_items.txt for HoS jacket

* (SQ-Merge) Adds in Floppy Bunny ears. (#3348)

* (SQ-Merge) Possible fix for drop-nomming (#3331)

* possible drop-nomming fix

* no longer 100% fall cushion on non-aligning prefs

* fixed some checks

* (SQ-Merge) Makes rads not kill people in stomachs (#3342)

* Makes rads not kill people in stomachs

* There we go

* Update radiation.dm

* POLARIS: Fixes #3308 (VS) - Skrell lack eyes

* POLARIS: Fixes #3280 (VS) - Typing as ghost removes overlays

Also gives them the proper ghost speech bubble. Unsure why it wasn't used!

* POLARIS: Fixes #3298 (VS) - Observer-ghosts were naked instead of dressed

* POLARIS: Fixes #3270 (VS) - Cleanbots make noise too often, reduce chance

* POLARIS: Fixes #3264 (VS) - MMI insertion sanitizes w/o numbers allowed

* POLARIS: Fixes #3237 (VS) - Cryoconsoles are lit even when unpowered

* POLARIS: Fixes #3238 (VS) - Nothing but humans can understand silicons talking

* POLARIS: Fixes #3221 (VS) - No explanation of what to do in the case of system instability

* POLARIS: Fixes #2601 (VS) - Allows mechs to continue charging after battery swap w/o moving

* POLARIS: Fixes #5282 (VS) - Allow use of pens to label pill bottles, like glass bottles

* POLARIS: Fixes #2573 (VS) - Slap cigarettes off people's faces

* POLARIS: Ventcrawling assistance

* POLARIS: Fix holders to avoid forcemoving held mob to nullspace

* POLARIS: Allow crawling through vertical pipes

* POLARIS: Weird snacks runtime

* POLARIS: Sometimes items have this set to null because they are bad.

* POLARIS: Beam weapons runtime when you shoot yourself

* POLARIS: Fix a call to the wrong update icons in prom regen

* POLARIS: Fix incorrect robolimb checks

* POLARIS: Heal robolimbs when you heal everything

Typically only used in magic and stuff, makes sense to heal both (otherwise there's no way to heal whole FBP bodies)

* POLARIS: Add eye color to shapeshifters

* POLARIS: Adds an animation thing, uses it on ventcrawls

* Fixes Suit Storage Icons
Items in suit storage should no longer vanish.

* Adds Keypad Auth to CE Office

* 44 revolvers

Port from Bay

- Addition of two more revolvers in 44 cal for variety
- Creation of rubber rounds for 44 cal (stats taken from virgo no idea how good they are in actual fights)
- Includes 44 ammo speedloaders, regular and rubber speedloaders
- Slight adjustments to allow for firing animations taken from Bay (the mosley revolver has a firing animation that plays)
- Includes in hand sprites

We did already have the 'webley' sprite (it exists in a recolored sprite). However it is a alternate sprite for the detective's 45 revolver. This brings it in as a actual proper revolver with sprites that are different than the detectives revolver, and maybe in the future can be thrown into loot lists and PoIs.

* Adds bioprinter to medical

Only internal organs work well

* Fixes feathered tesh tail and removes an useless piece of code.
-Feathered tesh tail now uses the proper dual color system now that it no longer comes with the default tail.
-Removes completely redundant body hair code from robolimb icon generation.

* byond beta back on its bullshit

* Update organ_icon.dm

* Update organ_icon.dm

* Probably maybe fixes blank lines for prey

* Fixes incorrect camera naming/networks. Fixes #3353

* Nanoui now supports use of multiple templates (#5105)

* Nanoui now supports use of multiple templates

* Removing debug code, indentation

* Indentation

* Arranges lots of things into planes (#5072)

* Rearranges a billion things into planes

* Make cryotubes fancy

* Update Travis

* Fix hiding logic

* Lore-Compliant Oculum News Channel (#5111)

* adds an e-reader full of news to the loadout

* Political Almanac -> Pocket Newscaster

* new news channel containing lore-compliant news that's not bad

* prettified lorecodex, added a month's worth of news (#5112)

* prettified lorecodex : added a month's worth of news

* what the hell elgie

* all according to kaikoku

* Grant remote profile access to R_DEBUG holders

* Fix for MOB_CAN_SEE_PLANE

* Normal brute kits disinfect wounds

* Fixes fullbright mode hiding lighting overlays.

Fullbright plane master being above lighting plane master is important, shouldn't be removed.

* Fixes machines being below tables they should sit upon.

* Fixes Runtime in logging.dm,61

* Removes vials

* Update and rename pai_manifest.tmpl to crew_manifest.tmpl

* Change of template

* Fixes infinite loop in FBP naming w/o client

* Adds Map Template Groups
Adds ability to have many different 'versions' of a PoI, yet only having one show up per round.
An example on how to do this is provided with Radio Free Sif (aka DJOutpost).
Just make sure all the different versions have the same 'template_group' value.

* Adds a message on emag to the battle arcade machine. (#5129)

* Updates one arcade machine emag message to to_chat, adds another.

* Returns 1 in emag_act for orion trail.

* Converts a bunch of stuff to macros. Should probably not break anything.

* Fixes an improper macro usage.

* Attempts to fix all 20 errors.

* Makes syndie dufflebags hint that they let you move faster

* Fixes untagged sorting junction

* Actually adds adhoc_fallback to pilot headsets

* Map fixes and tweaks

- Flashers in brig cells now should work, extra floor flash in communal brig to deal with crims.
- Inproper access, SMES rooms.
- Trader start point being dark now fixed.
- Medical Vendor Plus has more advanced burn and trauma kits. Also splints.
- Cell 1 and 2 in the brig can now be accessed by detectives.
- Additional r-walls next to the engine room to help with rads.
- Floor decals in a couple areas.
- RD office now has its telescreen back.

* Fix unused variable warnings.

* Fix light/camera layers for macros and fix constants for them too.

* Updates changelog

* Camera types exist to determine networks!

* Reverted use of 'usr' back to 'user' from commit 05fd53ebcc

* Fixes a bug. It's flatland zorren. 

Fixes #3376

* Fixes wallet-HUD interaction issues. (#5130)

* Fixes wallet-HUD interaction issues.

* Fixes HUDs, too. Forgot to commit this the first time. Also hopefully didn't change the map to examplemap.

* Fixes an indentation error.

* Nerfs solargrub drain speed.

Due to the lack of saturation in the moderate event container, solargrubs show up way too frequently, and changing the frequency doesn't help. The container has to pick. This change will just bump the drain speed down so severely, that if you kill one or two grubs, the station should barely feel the impact anymore. As opposed to having to kill 4/5 grubs on average.

Gradual nerfs seem logical, as grubs get more and mroe of a day-to-day experience, and most people know about them now. Time to stop the witch hunting for those annoying grubs :p

* In which MC is dumb. Actually removes network override

* Initial cleanup/changes

* More optimizations for character joins

* Switch cables and pipes to use define constants instead of literals for layers.

Also fix a few things to be on the correct plane.  Basically the under-floor stuff is supposed to be on PLATING_PLANE.
Portable atmospherics go on object layer so they are above stationary machinery, given that they move around.
Fixed wires to be on top of pipes like they used to be, otherwise they'd be obscured too often.

* Don't kick admin observers for inactivity.  They might be waiting for ahelps.

* Fixes vox not having hardsuit sprites. Uses the new defines.

* Replaces base egun sprite

* Small fixes and ports discovered during merge. (#5138)

* POLARIS: No string compare for assistants

* POLARIS: Move these planes to more useful places

* POLARIS: Only spam ghosts with chat messages from things with real clients

* Fix small forgotten lines of text accidentally left out of VS syncs.

* Fix typo'd plane in lighting.dm and remove redundant definitions.

* Fixes a bunch of simple animal vore icon issues.

* Fixes Pathing

* Small Shock/Holo collar tweaks.
-Updates their old >> dialogue.
-Makes shock collars taggable.

Was gonna fix them showing up in forced lowercase on people but that turned out to be a separate polaris issue that I just opened a fix for up there.

* more fixes etc

* Update solargrub.dm

* Improves contrasts on sprites and removes the need for mirroring upstream sprites

* adds generic gibs to vore mob icons to prevent sneks

* Adds a bunch of stuff to cargo selection.
-Xenowear crate, 13 non-random xenowear items for 100 points.
-Teshari smocks crate, comes with all the 5 basic colors for 25 points.
-Teshari undercoats, comes with 4 random colors from basic and grey selection for 20 points.
-Teshari undercoats black, comes with 4 random colors from the black trim selection for 20 points.
-Teshari cloaks, comes with 4 random colors from basic and grey selection for 40 points.
-Teshari cloaks black, comes with 4 random colors from the black trim selection for 40 points.
-Utility uniforms, comes with the 3 loadout utility uniforms (black/blue/grey) for 30 points.
-Skirts crate, comes with the 10 regular type skirts for 40 points.
-Varsity jackets, comes with the set of 6 colors for 60 points.
-Leather gear crate, comes with 5 random items from a selection of 21 more or less tough/kinky gear for 50 points.
-Eyewear crate, comes with 11 cosmetic and/or prescription pieces for 50 points.
-Gloves crate, comes with 4 random gloves with a chance to hit a couple fancier ones among the basic colors for 40 points.
-Boots crate, comes with 3 random pairs of boots freely available in loadout for 60 points.
-Taurbags crate, comes with the 3 universal saddlebags we have (basic/robust/vest) for 60 points.
-Cuisine crate, comes with 5 random foods from a list of varying cultural fanciness for 25 points.
-Burger crate, comes with 5 random basic burgers for 15 points.
-Special burger crate, comes with 3 random special burgers for 60 points.
-Bakery products, comes with 5 random bakery products for 15 points.
-Cakes crate, comes with 5 random cakes for 50 points.
-Mexican food crate, comes with 5 random mexican foods for 15 points.
-Asian food crate, comes with 5 random asian foods for 15 points.
-Action figures crate, comes with 5 random figures for 50 points.
-Tabletop miniatures crate, delivers the set of those characters for 30 points.
-Plushies crate, comes with 3 random plushies for 30 points.

* Changes wedding rings to be a subtype of ring

Also moves them to their own .dm, since they're now a subtype of the thing in rings.dm. Also changed bethrothed to spouse, as the former is usually before marriage and not after.

Benefits of this include: Being able to wear gloves over wedding rings. Making them tiny instead of small. Making their gender neuter instead of plural, so it wont say "some wedding ring" when you examine someone wearing them. Probably more good things.

Issue reported by HzDonut.

* Cargo pack tweaks.

* Adds a machine for recoloring apparel ingame.
-Not mapped in currently.
-Still unsure whether to have it whitelisted for white/grey items only or to let people have their fun experimenting on nasty aesthetics.
-Also supports bags and belts. Yes, I've heard the pleas of the people not liking the default grey being the only public backpack option there is.

* Reverts gauze disinfecting until a proper solution can be put in place.

* Fixed mesons NIFSoft overlay not highlighting open spaces above

* Fixes #3368 - Teleporting now often respects dropnom pref

* Fixes #3344 - Holocarp set DM_HOLD when holodeck is safe

* Squashed commit of the following:

commit f55edb98499b600186be9f58c0d245b454479b74
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 17:05:19 2018 +0300

    we'll see about that whitelist crap later then

commit 186ce2aba274c4009c42a730d1ba7c67dddf8ea6
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:32:08 2018 +0300

    screw you too travis

commit 470789300bda3949de4027dc8e2c25ae8427eaae
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 16:10:29 2018 +0300

    Update painter_vr.dm

commit e9dee86b0cb84172c95f3a91ba73ce0b2661820c
Author: Verkister <superverkelian@hotmail.com>
Date:   Sun Apr 8 15:51:37 2018 +0300

    Update painter_vr.dm

* allows meteors to be deflected by baseball bats

* snib

* oh, and the DME, too

* fixes the meteor refusing to move at all after being deflected

* done

* Fix shuttle corner turfs disappearing when shuttle moves.

When shuttles land on a turf, it takes the appearance of the turf it lands on as an underlay.  Must make sure this underlay is on FLOAT_PLANE otherwise it will likely end up OVER the turf itself.

* Set appropriate vars for persisting adminspawned characters

* Minor Psych office tweaks. Closes 2090

* Adds compact defib to CC medbay. Closes #2287

* Makes the door button in EVA ACTUALLY WORK

* Squashed commit of the following:

commit bd470fd0276e83fa1516cc1b966308165d081b1b
Author: Verkister <superverkelian@hotmail.com>
Date:   Tue Apr 10 20:45:00 2018 +0300

    Update painter_vr.dm

commit 12e39bcec9b717d477a64aca0f8dfe917917986b
Author: Verkister <superverkelian@hotmail.com>
Date:   Mon Apr 9 09:34:50 2018 +0300

    Update painter_vr.dm

* Reduce abduction chance 1%->0.5%, add logs

* Removes Camilla's plush as per request

* Some protean fixes (regen, size as blob, gender)

* switch map to tgm for merge

* convert map to tgm for merge
2018-04-11 17:14:22 -07:00
Cameron653 b3efd60a72 Merge branch 'master' into SILENCEDMP5A5_FLUFF 2018-04-11 00:37:26 -04:00