Commit Graph

12490 Commits

Author SHA1 Message Date
BurgerLUA
991a6aaa5d Fixes #4748 (#4770) 2018-05-20 18:17:49 +03:00
BurgerLUA
713b5475d9 Fixes #4743 (#4771)
Vending machines couldn't be restock due to a new variable being introduced that prevents vending machines from being restocked. Now, private vending machines such as seed storage units and booze-o-mats can now be restocked. Public ones like soda machines can't.

Tweaked the Garden to reflect this bug change.
2018-05-20 18:17:33 +03:00
Mykhailo Bykhovtsev
fb2e05e4fd Empulse fix (#4762)
In my recent PR #4752 while merging my new functional empulse_exclusive into empulse I have accidentally deleted important check. This adds it back!
2018-05-19 08:22:15 +03:00
Mykhailo Bykhovtsev
5f9a4ac859 More bugfixes (#4752)
Made generic empulse_exclusive which takes list of atoms that needs to be excluded.

Wizard disable technology(emp) spell uses empulse_exclusive with caster being excluded from being EMPed. This will allow IPC wizard not damage themselves with cast. But it will still damage other wizard IPCs.

Added screwdriver, crowbar and a wrench to janitor's closet. Fixed #4755

Replaced turrets in ERT ready room with cencomm check turrets. Fixed #4742
2018-05-17 22:38:26 +03:00
Alberyk
02913f3dc1 Custom items 16/05 (#4749)
Adds the following items:

Unathi Purple Dress - Ilaeza Marwani - burgerbb
Unathi Purple Boots - Ilaeza Marwani - burgerbb
Unathi Arm Warmers - Ilaeza Marwani - burgerbb
Clan Marwani Emblem - Ilaeza Marwani - burgerbb
Adhomian Divination Cards Deck - Klavdiya Tikhomirov - alberyk
Moon Shaped Amulet - Klavdiya Tikhomirov - alberyk
Spark Gloves - Lunea Discata - tishinastalker
Kitting Needles - Fernando Gonzales - resilynn
2018-05-16 21:34:21 +03:00
Mykhailo Bykhovtsev
f16d4935e5 Destroy for oxy candles (#4745)
Apparently, I missed adding clean destroy to oxycandle. This adds it!
2018-05-15 21:26:43 +03:00
BurgerLUA
c4cda59621 This PR is the very definition of "They were right." (#4729)
Fixes various runtime bugs caused due to not testing the requested changes, such as the inhalers not playing sounds or the breath analyzer not analyzing breath.

Also improves some things due to feedback, such as the breath analyzer doing too much damage when thrown, and the garden being weird.
2018-05-14 10:17:20 +03:00
Alberyk
34477cf04d Bug fixes for may update of 2018 (#4726)
-fixes all food having chocolate
-fixes #4725
-removes a bad file that was supossed to be a changelog
2018-05-14 00:45:28 +03:00
Alberyk
baedf50918 Bugfixes: resisting grab and synth version (#4712)
-fixes #4704, so you can resist properly out of neckgrabs again if your stunned value is low enough
-fixes the ipc construction whitelist check once for all
-fixes orb's eyes sprites being at the wrong direction
2018-05-14 00:39:32 +03:00
skull132
674cd94714 Merge branch 'master' into development
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
2018-05-13 19:19:52 +03:00
Werner
caaed22df2 IPCs cant be cultists (#4711)
Implements https://forums.aurorastation.org/viewtopic.php?f=18&t=11130
2018-05-13 18:16:55 +03:00
Werner
520d294c8d Moves the Janitor Back to Civilian (#4716)
The Janitor is moved back to civilian.
2018-05-13 18:07:44 +03:00
BurgerLUA
97a4466ff1 Hydroponics Seed Fix (#4717)
Overview
The hydroponics vending machine was changed to a different variant that uses a better UI, but lacked many of the available seeds. This quick update gives more seeds to bother the garden vendors and the hydroponics vendor.
2018-05-13 18:00:39 +03:00
BurgerLUA
aad698be53 Mental Medication Additions (#4648)
The less controversial tweaks
Tweaked the metabolism rate of mental medication to reflect their intended values. Reduced the dosage threshold to suppress traumas to reflect their intended values.

Syringe (drugs) now contains truth serum.

Cardox is now slightly poisonous, and can directly remove phoron from blood when consumed. Cardox can now remove phoron in the air when applied to turfs.

A secure box of loyalty implants, hextrasenil pills, and cardox grenades are now located in the vault.

The vault now contains some misc emergency gear that a head of staff can access in case of a dire situation. Current gear are loyalty implants, expensive cardox grenades, and Hextrasenil pills.
2018-05-13 17:39:56 +03:00
Ron
e388235cef Changes (#4594) 2018-05-12 21:15:01 +02:00
Mykhailo Bykhovtsev
115802425f Oxycandles (#4650)
This PR adds new item - oxycandles.

The idea is based of this thread.

chemical bases oxygen candles that when activated can provide enough oxygen to make tiny-small vented spaces with oxygen.
Oxycandles properties:

When activated the chemical reaction cannot be stopped - emergency use only.

Small size, can fit anywhere.

Can restore air in very tiny-small vented place.
2018-05-11 22:22:57 +03:00
Alberyk
94a1af3577 Custom items 08/05 (#4698)
Adds the following items:

-Dull Headwraps - JIX - kyres1
-Dull Robes - JIX - kyres1
-Titanium Faceplate - IRD - kyres1
-BARON's Dice - BARON - iamcrystalclear
-Vasili Mine Zippo - Nikit Vasili - simontheminer
-O.R.B. cyborg sprites
-COFFIN SENTINEL cyborg sprites

Other changes:
Removes Muhawir's wallet at the player request. Delete pointless items, that were just bloat since they had no custom sprite or function of their own, and implement them with the config. Also, adds support for weighted dices, since this was needed for an item.
2018-05-09 23:56:35 +03:00
Alberyk
03cf84880c Adds weaponry permission access and a bit more (#4665)
-adds weaponry permission access, that is used by the securitron to check if the person can use a weapon, added to all security roles, the head of personnel and the captain
-added a firing pin that checks for access
-fixed the ert id having access to things they should not
2018-05-09 10:22:51 +02:00
Alberyk
8189a5125b Changes how detomatix pda detonation works (#4694)
-rewrites a bit of the code, to make it less terrible
-fixes #4657 by making sure that the pda properly explodes now
-removes relative pathing from the pda box
2018-05-08 12:08:16 +03:00
Mykhailo Bykhovtsev
9571507b36 More Bugfixes (#4676)
Changed name of Chemistry request console. Fixed #4670 Fixed #4678
Deleted duplicate windoor in the brig. Fixed #4419
Added one more GPS and emergency medical radio link to EMT room. Fixed #4380
Replaced area of Mainlevel Cryostorage from primary hallway to cryostorage. Fixed #4290
Increased size of Toxin's airlock, adding ability to refill canister from main oxygen supply by using air distro that is used in Mining and Xenoarcheology airlocks. Fixed #4145
Changed c_tags for cameras in Medical construction level. Fixed #4677
Merged two definitions of glasses into one.
Renamed few Request consoles in security construction level according to their room names. Fixed #4687
Fixed turrets without control panel not updating their lethal sprite in lethal mode.
2018-05-07 22:31:11 +03:00
Erki
28a1d8d3d7 Remove duplicate macros (#4683) 2018-05-06 18:31:03 +03:00
BurgerLUA
f197426b8c Cargo Loot Improvements (#4651)
Since the warehouse is now bigger, it would make sense to increase the amount of loot that spawns in the warehouse. This PR effectively does that, as well as removes some of the more useless items that can spawn in cargo.
2018-05-06 18:23:09 +03:00
ParadoxSpace
49be412edd Adds Cyberpunk Hairstyles (#4671)
Courtesy of TheTrollDoctor and Dukica99, of Baystation12 fame.
2018-05-06 18:13:27 +03:00
Lohikar
da3af646d6 Bolt-action refactor (#4667)
Makes bolt-action rifles a child of pump-action shotguns again to remove some shared code.
2018-05-02 21:24:32 +03:00
Alberyk
207608b60c Ports some sounds from baystation (#4675)
This pr ports some sounds effects from baystation12, it has sounds for:

-using medical items
-using hyposprays
-opening some storages, like briefcases and toolboxes
-lighting matches
-magboot activation sounds
-holster sounds
-tape sounds
-pen and stamp sounds
2018-05-02 00:20:56 +03:00
BurgerLUA
652baabb5a More Food (#4644)
Adds more food for the chef to cook. Items include:
Bacon Flatbread (Not pizza)
Breakfast Wrap
Meat Pocket
Fish Taco
Pineapple Rings
Pineapple Pizza
Chocolate Truffles
Bacon Burger
NtMuffin
BLT
2018-05-01 20:11:56 +02:00
Werner
6158575afc Load static lore news from the DB at the start of the round (#4618)
Converts the news network into a subsystem
Loads news from a database at the start of the round
No longer ties the PDAs to the tcoms system to access the news (which was broken anyway)
Removes the trivial news event
Adds the already existing virology / xenobiology containment events to the rotation
2018-04-29 22:47:30 +03:00
Werner
cfd1900ee4 Security Fines (#4634)
Allows security to fine criminals with the sentencing console
Prints a human readable copy of the charges and the applied sentence
2018-04-29 20:34:49 +03:00
skull132
d27af2445e Merge remote-tracking branch 'upstream/development' into development 2018-04-29 17:32:58 +03:00
skull132
26fc08e65c Merge branch 'master' into development 2018-04-29 17:32:06 +03:00
Lohikar
7ef4090f00 Z-Lights Mk 2 (#4383)
changes:
Bidirectional source Z-lights have been reverted to single-direction in favor of corner z-bleed.
Z-mimic turfs will now average their light level with their mimiced turf to better approximate Z-lighting.
Openspaces have been made significantly less dark.
Corners no longer incorrectly always take the instant update pathway.
MultiZ helpers are now macros.
More things now properly respect area dynamic lighting settings.
2018-04-27 23:10:59 +03:00
Mykhailo Bykhovtsev
e6baab0c23 Code and Map Bugfixes (#4514)
- Access to Research Division Maintenance airlock is fixed #4477 
- Changed shower to wash any mob present on active shower tile, also added damage to slimes. #4483 
- Added missing emergency firelocks in interstatial level of security. #4444 
- Fixed wrong spelling of broken light  bulb icon state, issue #4541 
- Added for pool to use reagents water on mobs or objects, now pool cleans itself and user, plus damages slimes. #4544 #4545 
- `crush_act` now checks if atom is simulated. #4001 
- turbolifts now use `crush_act` on atoms.
- Closets have their own crush_act. They now gib mobs inside of them. issue #4538
- Closets uses its internal function to dump content upon destruction.
- Closet now spawn one sheet of steel when destroyed.
- Fixed chainsaw unwielded force to be appropriate. Buffed chainsaw on wielded/unwielded force. Wielded is now `60` and unwielded is `30` if it is powered. #4586 
- Added missing cameras to medical construction level. #4581 
- Hydroponics tray status no longer blocked by light fixture, moved it in a better spot. Added one more light to hydroponics to not have shadows. #4449
2018-04-19 00:03:46 +02:00
skull132
2eb0adb704 Merge branch 'master' into development 2018-04-18 22:16:24 +03:00
Erki
a6410d75ad Fixes timer spam from proximity_callback (#4635) 2018-04-17 23:02:34 +03:00
Alberyk
55f0ac34da Fixes branded robotic torsos (#4624)
Corrects the wrong linked_frame vars.
2018-04-16 20:24:00 +03:00
Ron
a8dde49779 purgesactors (#4596) 2018-04-16 13:01:02 +02:00
Ron
62d4e70c09 Fixes #4612 (#4614) 2018-04-15 22:15:28 +03:00
Alberyk
2d47b59d76 Fixes an ipc building bug. (#4610)
It should check the proper species now.
2018-04-15 22:15:19 +03:00
Lohikar
9c33cc2e09 Minor refactors/fixes (#4589)
changes:

Underwear has been promoted to a human layer; this might fix some potential issues with human icon caching.
turf/Entered() code has been cleaned up and proximity checks have been timerized.
Fixed an issue where openspaces wouldn't render objects that entered an openspace after init.
Shortened organ keymap prefix as it didn't really need to be that long.
2018-04-15 22:13:24 +03:00
Ron
d1c1d84bde Refactors gravity checking (#4591)
Removes a lot of duplicated or redundant code from areas when checking gravity.
2018-04-12 20:31:05 +03:00
Alberyk
f7fe5041f6 Bug and map fixes for the april update (#4576)
-fixes the jobban check on the ipc construction
-fixes eva having too much lights and skrell suits
-fixes #4569
-fixes the floor being a holo floor in the security second level
-fixes #4557
-fixes an extra pixel on the hudeyepatch
-fixes #4574
2018-04-09 09:45:51 +03:00
Erki
32d7540aba fix (#4570) 2018-04-09 01:45:11 +02:00
BurgerLUA
51aa7b0082 Shuriken Nerf (#4533)
Honestly I find that uranium ninja throwing stars are ridiculously overpowered and honestly just dumb in terms of mechanics. On top of the already ridiculous effects of getting hit by a throwing star, a uranium throwing star deals an additional random 25-50 toxin damage per hit regardless of armor, and regardless of whether or not it sticks in the wound. For reference, the xray rifle deals 25 damage per hit. I'm like 90% sure a uranium throwing star is more deadly than it's energy sword, which is just silly.

This update makes it so that the ninja throwing stars produced in the fabricator are of steel quality. To lessen the impact of this nerf, I also made some tweaks to uplink cost as well as the production cost of steel throwing star. Steel throwing stars also have less weight, and as an added bonus they can be purchased from the traitor uplink for 1 telecrystal each.
2018-04-08 16:30:50 +03:00
LordFowl
1086e1fdb2 [Ready for Review] Unapologetic Psych Buffs - Now with 80% less Mike Pence! (#4377)
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.
2018-04-08 16:29:33 +03:00
Mykhailo Bykhovtsev
7b8470ccae Removes nurse's outfit (#4520)
Argument was that nurse's outfit is too exposed for medical staff, and against sterile protocols.

Removes nurse's outfit to be spawned in medical lockers

Removes nurse's to spawn with nurse's outfit

Edit: Forum Topic regarding that is here: https://forums.aurorastation.org/viewtopic.php?f=18&t=10752
2018-04-07 21:17:45 +03:00
Alberyk
d7951fbd9f Changes how ipc resurrection works (#4472)
This prs removes the old method of ipc resurrection, which was just removing and placing the mmi/heart back into the body, which was really lazy and caused a lot of bugs.

Now, robotics can create a ipcs frames using the different brands in the robotics frabricator, based on the torso's brand. The law manager can disable by using a multitool on the head which is the diffence between creating a cyborg or an ipc. Also; it allows you to customize your snowflakness after your new body is created.

Changes: you can't print all torso types from robotics anymore, but there are torsos that come with their own brand, that you should be able to buy from cargo, that will allow someone to create another type of ipc.

Feedback Topic: https://forums.aurorastation.org/viewtopic.php?f=18&t=10705
2018-04-07 21:12:49 +03:00
Werner
d9d9131755 New cam networks (#4522)
Adds three new camera networks:

Civilian Main
Civilian Surface
Service
Replaced the "Civilian East" and "Civilian West" cams on the aurora with the "Civilian Main" / "Civilian Surface" / "Service" / "Supply" cams.
2018-04-06 23:11:03 +03:00
ParadoxSpace
2ddc7b6b08 HUD Eyepatches (#4513)
from left to right
security, medical, meson, material, science, thermal, welder, night vision, standard (no hud)

None add any flash protection except the welder HUD (only partly).
2018-04-06 22:04:02 +03:00
skull132
25ef886bf9 Merge branch 'master' into development 2018-04-06 21:53:02 +03:00
Werner
182d39512b Fixes #4346 (#4530) 2018-04-06 17:48:50 +03:00