Commit Graph

24448 Commits

Author SHA1 Message Date
MagmaRam
0b3c9238ea Fifty stacks can now be added to the R&D machines. 2016-11-23 22:31:06 -06:00
MagmaRam
82e2d67067 Changes the formatting for attack logs for reflex shots. 2016-11-23 19:22:38 -06:00
Anewbe
7075adba42 Adds toggle shoe layer, fixes knives 2016-11-23 18:23:39 -06:00
MagmaRam
7517d46d01 Merge pull request #2812 from Anewbe/spawn_fixes
Fixes two items not spawning properly, moves CE welder to locker
2016-11-23 18:12:42 -06:00
Anewbe
e8e0ab8762 Fixes two items not spawning properly, moves CE welder to locker 2016-11-23 16:13:55 -06:00
Anewbe
2df0ebaaee Lungs will only pop if the breath inhaled is less than the lung's safe pressure 2016-11-23 15:37:29 -06:00
MagmaRam
e87d0c9b92 Merge pull request #2808 from Anewbe/singuloth_rises
Singulo should be more stable now, produce power earlier
2016-11-23 14:37:25 -06:00
Anewbe
ea28bc8a44 Merge pull request #2804 from Nerezza/inflatablechanges
Inflatable QoL tweaks
2016-11-22 23:26:54 -06:00
Anewbe
f521625646 Singulo should be more stable now, produce power earlier 2016-11-22 22:00:43 -06:00
Anewbe
f6d311093a Merge pull request #2807 from MagmaRam/door_tape
Tape can't be put on doors infinitely.
2016-11-22 21:57:11 -06:00
MagmaRam
14a68d6dcd Tape can't be put on doors infinitely. 2016-11-22 21:36:05 -06:00
MagmaRam
c34c7ebe64 Merge pull request #2805 from Anewbe/signlang_logs
Ports bay's signlang logging
2016-11-22 20:11:40 -06:00
Nerezza
d522f6d931 Inflatable QoL tweaks
Features:
- Ctrl-click can deflate inflatables now.
- Using inflatables on adjacent tiles deploys them to that tile. Currently this doesn't care about objects in the way, ie computers or welding tanks, but it does respect glass and imo it works fine this way.

Bugfix:
- Bumping an inflatable door no longer freezes it closed for a few moments.
2016-11-22 01:13:29 -06:00
Nerezza
7606c6866a Slightly animated hazard shutter prying
- Hazard shutters slightly open or slightly close, and play the prying sound effect, when someone's prying them. This helps identify what shutters are being operated in an emergency, even if the prying-open one looks a tiny bit silly considering the purpose of these things...

- Two or more people can no longer pry the same shutter simultaneously, only the first to interact can while the rest get a to_chat response. Before, the shutter would open then close almost immediately.

- Cancelling your prying early no longer instantly pries the door open. A misplaced return no doubt lead to many accidental sacrifices to the angry wind gods.
2016-11-21 23:18:47 -06:00
Anewbe
18e7851a8f Ports bay's signlang logging 2016-11-21 21:44:41 -06:00
Nerezza
f94bf5c18f Fixes runtime in inventory.dm
Clicking an inventory slot with nothing in your active hand would runtime. Now it checks to make sure you have something in your active hand, and if not it returns 0.
2016-11-21 20:36:39 -06:00
Nerezza
d7104ef027 Misc APC fixes & tweaks
-Adds a Polaris version of APC rebooting
-Changes the random APC-bluescreening event to be more sensible in what it does and how to repair it. Bluescreened APCs are permanently unlocked, and can be fixed by removing the power cell and applying a multitool.
-EMP'd APCs now give Bay's timed (or manual) reboot nanoUI so that important places aren't shut off permanently if engineering can't get around to them. 
-Nins and twizs no longer **** up APCs when they drain power from the cell completely. Also, drained power comes from the powernet primarily, and only draws from the battery if the powernet doesn't give enough (random chance) or if the cable is cut.
-Bluescreened APC sprite now switches to an open wire panel sprite if a screwdriver is applied.
-Grid checks put a nanoUI notice on APCs. As it is now, you have to wait for the grid check to end or use the grid checker in engineering before you can manipulate APCs.
-Grammar fixes
-More grammar fixes
-My god the grammar fixes
-to_chat'd the user <<s again.
-Merged a small clean-up to power states.
-Bashing APCs to pieces was always ineffective but would spam everyone anyway. Now, it only spams the person bashing the APC. This is a placeholder, ideally you should be able to bash a working APC's cover off if you want its battery out but this PR is already big enough as is.
2016-11-21 20:04:58 -06:00
MagmaRam
cba3c78ed5 Merge pull request #2799 from Anewbe/defib_fix
Defibs should actually work now
2016-11-21 19:34:24 -06:00
Anewbe
07b5b6fc1c Defibs should actually work now 2016-11-21 19:18:05 -06:00
MagmaRam
4ed2cc0176 Merge pull request #2756 from Anewbe/lightning_stun
Lightning spells and bioelectrogenesis will no longer stun outright
2016-11-21 18:48:58 -06:00
MagmaRam
fdae3a6a60 Merge pull request #2778 from Anewbe/cult_revive
Cult Raise Dead fix
2016-11-21 18:45:49 -06:00
Anewbe
fc8e2347d9 Merge pull request #2793 from Yoshax/yakkity
Can open doors without access requirement when handcuffed
2016-11-21 18:02:14 -06:00
Anewbe
a00236a3f9 Merge pull request #2790 from Atermonera/Fixes_#2630
Fixes #2630
2016-11-21 17:58:54 -06:00
Anewbe
be7ca7f87d Merge pull request #2795 from Woodratt/1.6.2_Maptweaks_and_adds
1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
2016-11-21 17:58:20 -06:00
woodratt
a3fc7dad15 1.6.2. Map Tweaks Random Loot lists yet another Armory Overhaul.
- Taken from Bay and edited a bit, maintenance now has a chance to have some randomized items in crates and on racks. Nothing extremely exciting or game changing should spawn yet, sadly. Probably still needs some adjustments and really needs some additions but works at this stage for live testing to see how badly RNG wants to spawn sin pockets and botany gloves.
- Minor map adjustments to both z-levels 1 and 2. Including things such as a mirror placed on the technomancer ship. Light adjustments on the main z-level. Removing redundant lightswitches, adding lightswitches, removing redundant newscasters. Fixing other old mapping errors.
- Largest chunk of change, rework of the armory. Image Link Two sets of all of the armor except for the riot armor has been removed from the armory. A 'tactical equipment' storage room has been readded (warden access) with the combat armor, lethal ammo, and two of both the energy weapons and ballistic guns moved to it. Four energy weapon power cells have also been added to said equipment room as well as one magazine of lethal 45 ammo (it was 5 magazines before, this makes it a even and less OCD annoying 6, like the rubber magazines).
- Practice ammo moved from the armory to the firing range on a conveniently empty table.
- Defib units now available in medical, and one in both first aid checkpoints.
2016-11-21 14:41:13 -08:00
redstryker
469082aa59 Head Item Additions and Changes 2016-11-21 17:00:23 -05:00
MagmaRam
e93095bbda Merge pull request #2722 from Anewbe/liver_damage
Makes tox damage more dangerous
2016-11-21 12:35:51 -06:00
MagmaRam
a3fb16fa76 Merge pull request #2785 from Nerezza/doortweaks
Misc windoor fixes. Dron (and borgs) can now rename airlock/windoor assemblies.
2016-11-21 12:35:43 -06:00
MagmaRam
4c533c0a74 Merge pull request #2745 from Anewbe/stimm
Adds Stimm, a homemade hyperzine; makes hyperzine toxic
2016-11-21 12:34:38 -06:00
Nerezza
2538854c3f Merged master into APCwork 2016-11-21 12:04:08 -06:00
MagmaRam
6e88fc4b82 Merge pull request #2786 from Anewbe/syringe_again
Fixes the double use bug on syringes
2016-11-20 20:43:06 -06:00
Yoshax
59994a5656 Can open doors without access requirement when handcuffed 2016-11-21 01:28:30 +00:00
Techhead
e679590204 Allows breaking tape with any object.
The previous system was arbitrary, considering you can use your bare hands.
Resolves #14642
2016-11-21 00:07:35 +00:00
Nerezza
867e1cee13 Updates for Yosh's work
Robot/dron tesnsions escalated!
2016-11-20 16:56:12 -06:00
Nerezza
95dc6af3ad Merged master into doortweaks 2016-11-20 16:51:56 -06:00
Nerezza
812d1b1df4 Filters the lesser borgs
You now have to be a greater borg (or the god-emperor of borgs) to rename airlock assemblies.
2016-11-20 16:47:52 -06:00
Anewbe
e2406123e9 Merge pull request #2788 from Yoshax/welder
Fixes up and implements the experimental welding tool
2016-11-20 15:22:11 -06:00
Atermonera
ed56e73b83 Fixes #2630 2016-11-20 12:36:18 -08:00
Yoshax
804c67fc00 Removes crate, removes from vending, changes changelog 2016-11-20 20:30:19 +00:00
Yoshax
f4bf14c4e6 cleans up some missed stuff 2016-11-20 20:05:16 +00:00
Yoshax
d2ea8568a8 All robots now get crowbars, flashes and fire extinguishers 2016-11-20 19:41:25 +00:00
Yoshax
503028a35b Adds changelog 2016-11-20 19:12:03 +00:00
Yoshax
55c0fc86a3 Fixes up and implements the experimental welding tool 2016-11-20 18:59:06 +00:00
Anewbe
a7986f6500 Merge pull request #2783 from Yoshax/robotsucks
Allows borgs to use toggle lock on closets/crates
2016-11-20 12:23:17 -06:00
Yoshax
2c6d023fc7 Changes an attack_ai to attack_robot 2016-11-20 18:04:09 +00:00
Nerezza
c25c2d9f1f Some work on making APCs better
Grammar fixes, more grammar fixes, a couple bug fixes, a few more grammer fixes.

Oh I also went ahead and to_chatted them user <<s again.
2016-11-20 03:24:47 -06:00
Anewbe
c59f2a9711 Fixes the double use bug 2016-11-19 23:02:40 -06:00
MagmaRam
435484e1d1 Merge pull request #2781 from Nerezza/bulkyjumpsuits
Makes jumpsuits hide under space suits under right conditions.
2016-11-19 22:22:59 -06:00
MagmaRam
643315ce8e Merge pull request #2770 from Anewbe/commiecomms
Makes Communicators free
2016-11-19 22:22:16 -06:00
MagmaRam
46ad1a5baf Merge pull request #2784 from Yoshax/ivdrip
IV Drips are no longer dense
2016-11-19 22:20:34 -06:00