Commit Graph

4055 Commits

Author SHA1 Message Date
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
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
Werner
65270a42ec Add Cameras to medical isolation (#4754)
Adds cameras to medical isolation
2018-05-16 21:33:53 +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
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
520d294c8d Moves the Janitor Back to Civilian (#4716)
The Janitor is moved back to civilian.
2018-05-13 18:07:44 +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
Mykhailo Bykhovtsev
b6151fb1a9 Fixing AI intercomms (#4709)
PR #4229 did not fix all of the intercoms. This PR has microphone to be off by default for all AI intercoms.
2018-05-12 12:24:46 +03:00
BurgerLUA
3a957f3054 AI Z Protection + Bomb Range Tweak (#4668)
Overview
This prevents the "drop metal rods on ai" meme by adding a layer of reinforced metal on the level above the AI core.

Also prevents the bomb range from fucking up cargo maint.

Images for more detail: https://imgur.com/a/HcovWo3

Feedback thread: https://forums.aurorastation.org/viewtopic.php?f=18&t=11025
2018-05-11 22:41:12 +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
Red_Wall
e39798b4a7 Security overhaul take 2 (#4621)
* Final version
- Added a window to the security office
- Removed janitor access from the lobby office
- Reset the access on lobby buttons

* fixing abruptly ending pipes
2018-05-01 16:24:13 +02:00
BurgerLUA
7e3d3e99e3 Hydroponics Redesign (#4593) 2018-05-01 12:20:27 +02:00
skull132
d27af2445e Merge remote-tracking branch 'upstream/development' into development 2018-04-29 17:32:58 +03:00
Alberyk
eecb6e8911 Exodus map fixes, part one (#4642)
-fixes cc having no floors/lights and the shuttle's walls, besides some antag related things such as the ninja base
-fixes the armory being outdated
-adds more mining gear to accommodate four miners and remove the drills from the asteroid
2018-04-29 17:30:17 +03:00
Mykhailo Bykhovtsev
3850b8acc8 Fixes #4308 and dup engine door (#4641) 2018-04-25 22:57:41 +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
BurgerLUA
74de9885da Fixes of Fixes (#4590)
PROPERLY allows unathi to wear boxing gloves.
PROPERLY and completely removed the buckle resist cooldown by fixing code oversights.
Removes duplicate definition of ethanol in the scrubber alert reagent table.
Fixes Xenoarch floating light and clean tiles outside the airlock.
2018-04-15 22:13:49 +03:00
Ron
498f7133fe Map bug fixes (#4595)
Fixes #4578
Fixes #4546
Fixes #4521
2018-04-12 20:31:13 +03:00
BurgerLUA
c005549772 Mining Map Fixes (#4583)
Fixes the map as intended. This fix makes it actually look good.
2018-04-12 20:28:02 +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
Werner
5af6800fbb Reverts the (accidental) revert of the cam networks (#4568)
Correctly sets the cam networks again.
Also names the doors to the substation on the civilian level correctly.
2018-04-08 22:36:44 +03:00
LordFowl
dddf3e24b0 fixes ladder 2018-04-08 12:55:37 -04:00
LordFowl
6367715114 initial 2018-04-08 12:07:53 -04:00
BurgerLUA
043b4b0247 Dumb Map Fix (#4558)
Ferner pointed out an issue with the conveyors in cargo. They are now fixed with this PR.
2018-04-08 16:30:14 +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
BurgerLUA
e8d22ed53d Cargo/Mining Map Tweaks (#4542)
Mining Map Changes
There is an easier way for paramedics/miners to traverse down zlevels, without the using of a mobile ladder. A new area is built for that purpose. Main level has a ladder going up and down to two different areas. Both areas are guaranteed to be connected to another airlock. Top level is connected to science, bottom level is connected to a cargo elevator. Atmospherics system in mining is more saner. The mining processor was made shorter, and 4 grates are guaranteed to spawn now for each miner slot, and contains it's own maintenance hatch for easy upgrades. Mining also now has its own requests console and disposals delivery destination. The industrial smelter is now twice as fast, however uses three times as much power.
2018-04-08 11:07:06 +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
Ezuo
4a6e3fb068 Adds Spawn-ERT-Commander verb for CCIA (#4463)
CCIA Agents now have the power to spawn as an ERT Commander. This will be mostly used for briefing outgoing ERT teams using information from faxes they have received.
2018-03-31 23:56:08 +03:00
skull132
a6f5a5b230 Merge branch 'master' into development 2018-03-21 07:08:05 +02:00
Erki
5c9a3dc675 Tickets and assorted (#4433)
* Fixes #4407
* Fixes #4393
* Fixes #4413
* Fixes #4231
2018-03-18 12:30:27 +02:00
Ivan Rubinson
a77a96cbe4 Bartender power creep (#4281)
Bar functions as part time coffee shop

Overhauled the coffee system and removed the old incomplete one.
2018-03-16 20:55:32 +01:00
Kaedwuff
3796847b39 Moved IAA spawn to their office. (#4297)
The IAA spawns were moved to their office chairs.

I also removed the chairs in the security briefing room that they previously occupied. There is now a bit of imposing space between the HoS and the rest of his team, which I like.
2018-03-16 18:48:48 +01:00
Alberyk
b48d2822d4 Some bug and mapfixes, march update version (#4412)
-fixes #4400
-fixes #4411
-fixes #4378
-fixes #4386
-fixes #4384
2018-03-13 21:30:17 +02:00
Juani2400
590abce9a9 Map bugfixes (#4375)
Fixes the floor at Medical's storage.
Fixes the light at Medical's storage.
Fixes the lighting issues at Security (dup with Alb's).
Fixes Engineering doors' access.
Removes the accidental shuttles in the centcomm level.
Adds a RC in the CMO's office.
2018-03-11 01:30:01 +02:00
Alberyk
443f250846 March update bugfixes (#4373)
-fixes lack of light in the forensic lower area of the brig
-fixes the window tinting button missing from the bar
-fixes #4371
-fixes #4370
-fixes the escape shuttle transit
-fixes the wizard coat missing in the map
-changes the color of when someone takes a tick to red, instead of blue
-removes the extra escape shuttles that were left somewhere on the map for some reason
2018-03-10 22:42:15 +02:00
Juani2400
395a7b3d60 [Map] Medical revamp and major changes. (#4324)
Complete remap of the Medical main level. Expect bugs and missing
equipment.

Added a new isolation wing to Medical.

Changed the nuke's position, to a much safer, new location.

Added an alternative exit to the Bunker.

Added a new store that only the HoP can grant access into.
-Detective and CSI's offices have been moved to a level above Security.

New Security training area, for cadets and other uses you may find to
it.

New transfer/escape shuttle. Not the final version, probably. Test of
acceptance from the community in progress. Not entirely convince by the
design.

New Research-coloured folders (Sprite recolouring by Fire and Glory).

Slightly remapped Kitchen. Tighter on space, big on table surface
area.

New Research Office by Xenobiology, after a lot of requests.

Vault entrance has been redesigned to fit a bit more with its purpose.

A lot of bugfixes, missing stuff, and minor suggestions.

Fixes #4311.

Fixes #4225.
2018-03-10 17:14:48 +02:00
Kaedwuff
46857f29ac Turns the AI Common intercom off by default. (#4299)
The bane of many new malf/traitorAI players who are unfamiliar with binary talk commands, this channel frequently blasted nefarious plans over common for unsuspecting evil AIs.

It has been silenced, but can be turned on manually like any other intercom.
2018-02-21 21:02:00 +01:00
Ezuo
99aa331b3b Skrell suit update (#4246)
You now must detach helmets from suits to refit them.
Skrellian spacesuits are now voidsuits, allowing you to attach helmets and magboots to them.
2018-02-19 21:40:49 +01:00
Lohikar
27f3df6929 Asteroid sprite fixes (#4276)
changes:

Replaced some bad references to the old asteroid turf type.
Fixed an issue where asteroid walls being mined down would always spawn the ash variant instead of rocky where appropriate.
Changed the abstract asteroid turf type to have a unique debug texture & description to make it more identifiable.
Debug tex (from TG):
2018-02-10_17-52-39

Fixes #4275.
2018-02-11 02:16:42 +02:00
Alberyk
dce802b457 Fixes penguins and more. (#4265)
-makes penguins a bit less terrible
-fixes the walls on the ninja base and adds a toolbox on it for real
2018-02-09 10:00:08 +02:00
Alberyk
4224780b3a Centcomm map fixes. (#4222) 2018-01-31 19:52:12 +02:00
Alberyk
c0425a867c More bugfixes for the january update (#4200)
-fixes #4172
-fixes #4193
-fixes #4192
-fixes #4189
-fixes #4179
-fixes #4170
-fixes #4197
-fixes #4201
-changes the access of the security checkpoint, so all heads of staff can use it
-fixes the hop being unable to access the account's computer
-fixes being able to feed holodeck penguins
-fixes modular laser weapons not interacting with firing pins
-fixes more guns not interacting with pins and remove the need for pins from certain guns, like crossbow, alien weapons and etc
-fixes unstable matter's portals and the elixir of life
-nerfs liquid fire a bit
2018-01-29 22:54:01 +02:00
Alberyk
2d029dcba1 Fixes broken shuttle walls (#4182) 2018-01-28 13:02:31 +02:00
Pacmandevil
b22cb0e59d [Ready for review until the inevitable map conflicts] Firing pins (#3375)
I'm going full steam ahead with this.

Adds firing pins/ Authentication mechanisms. these are needed to fire any specific weapon.

Weapons generally spawn with firing pins in them. or at least should. The exception to this is anything made in R&D - which needs to secure a firing pin from somewhere.

There's currently the following firing pins:

One that checks for a specific implant, EG a loyalty implant one.

One that always fails, and can replace other pins. (this one would likely be admin only. it's clown themed)

The Laser tag code got refactored to the pins. so each gun has a different pin. if you somehow got this pin, you could make it so you could only shoot a gun while wearing a laser tag vest, for example.

A Testing range pin, which only allows firing in specific areas - of which are mapped in currently.

A DNA locked one. and a subtype which will explode if someone else tries to use it.

the system's designed to be easy enough to add on to.

Feedback fourm is here:
2018-01-27 20:59:00 +02:00
Alberyk
2c18d91788 Fixes #4117 (#4156) 2018-01-27 18:47:43 +02:00
LordFowl
148ba78e64 Unapologetic Janitor Buffs (#4006) 2018-01-15 21:25:22 -06:00
Lan
12788617d2 Penguins (#4072)
Adds penguins, penguin babies and updates the holodeck winter with penguins
2018-01-14 18:57:26 +01:00
Lohikar
ef7bf447a3 Make runtime sort of multiz (#4064) 2018-01-07 11:22:04 +02:00
Lohikar
ea8785ee21 Re-adds the Exodus' holodeck's programs (#4041) 2018-01-03 13:01:21 -06:00
Lohikar
22deb57d7b Move mapsystem to _common (#4040) 2018-01-03 13:00:57 -06:00