Commit Graph

12448 Commits

Author SHA1 Message Date
woodratt
5444a4ad52 1.6.5 Port of Bay's uniforms
- Port of all of the uniform items that we did not have.
- Aether, Sweater, Ward-T. Frontier, Focal, Heph. Grayson, M. Bill, PCRC outfits/uniforms ported. (Loadout, some restricted)
- All of the military jumpsuits and uniforms have been ported. (Not Avail).
- Plain utility outfits are available in the loadout, as well as the pt outfits (except for marine).
- Hazard, Sterile, Saare, and Confederate outfits ported. (Not Avail).
2016-11-29 03:07:18 -08:00
MagmaRam
28856121a1 Merge pull request #2768 from Anewbe/wizbiz
Technomancer changes
2016-11-24 14:40:36 -06:00
MagmaRam
e13b42b193 Merge pull request #2818 from Anewbe/raise_fix
Should fix Raise rune
2016-11-24 14:38:44 -06:00
Anewbe
c85c789d71 Merge pull request #2803 from Nerezza/firelockchanges
Slightly animated hazard shutter prying
2016-11-24 14:14:08 -06:00
Anewbe
52b7d48de7 Should fix Raise rune 2016-11-24 14:12:28 -06:00
Anewbe
050aa30eb1 Merge pull request #2817 from MagmaRam/defib_fix_please_make_this_the_last_one_please_god
Defibs should revive people now.
2016-11-24 13:26:03 -06:00
MagmaRam
eef853393e Defibs should revive people now.
This might be an unnecessary fix, I might just have the worst luck.
But I couldn't get a defib to res in 10 tries before this,
got it on the second after.
2016-11-24 00:30:05 -06:00
Anewbe
e8e0ab8762 Fixes two items not spawning properly, moves CE welder to locker 2016-11-23 16:13:55 -06:00
Anewbe
ea28bc8a44 Merge pull request #2804 from Nerezza/inflatablechanges
Inflatable QoL tweaks
2016-11-22 23:26:54 -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
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
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
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
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
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
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
Nerezza
df5906dc6b Misc windoor/airlock fixes
This started as me making robots able to rename windoors and turned into something a little more.
2016-11-19 21:43:46 -06:00
Yoshax
bf298d9f94 IV Drips are no longer dense 2016-11-20 02:50:44 +00:00
Yoshax
98c1bcb614 Allows borgs to use toggle lock on closets/crates 2016-11-20 01:39:50 +00:00
Nerezza
9bda933376 Makes jumpsuits hide under space suits under right conditions.
Mostly noticeable on tesh wearing voidsuits, bulky jumpsuits were overlayed by the voidsuit making them 'peek' around the latter's icons.

Now, spacesuits in general will outright hide jumpsuits with exception only to rigsuits. Yeah I'm looking at you rescue suit, you and your ****ed up icons =3=
2016-11-19 15:52:11 -06:00
Anewbe
aa6cb91bc3 Hackfix2560 2016-11-19 12:41:21 -06:00
Nerezza
7b9be8c922 Gives cyborgs the ability to unbuckle things.
Checks if what they're attacking 'bare-handed' is adjacent to the cyborg, and has something buckled to it. If not, it passes the click on to AI click like usual.
2016-11-18 14:49:57 -06:00
Anewbe
1d30a71932 Technomancer changes 2016-11-17 20:11:21 -06:00
Nerezza
07b983a93f Merged branch master into LemonBranch 2016-11-16 16:48:04 -06:00
Nerezza
bdb1096a6b More lemons, plus milk!
Adds lemon juice and milk to booze-o-mat (not soda fountain) and adds lemon juice cartridges to appropriate Cargo lists.
2016-11-16 16:47:16 -06:00
Anewbe
cdef74bcdc Lightning spells and bioelectrogenesis will no longer stun outright 2016-11-15 21:49:06 -06:00
MagmaRam
20b6d4be57 Merge pull request #2718 from Anewbe/teargas
Adds teargas grenades, currently aspawn only
2016-11-15 20:05:35 -06:00
MagmaRam
890590d89e Merge pull request #2743 from Anewbe/sleeper
Fixes a sleeper bug
2016-11-15 20:01:43 -06:00
Anewbe
726015fcd2 Fixes the silent ERT 2016-11-15 18:27:40 -06:00
Anewbe
f646eeaca1 Fixes a sleeper bug 2016-11-14 15:55:31 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing
Ports sign language
2016-11-14 14:51:48 -06:00
MagmaRam
8240974ca2 Merge pull request #2740 from Anewbe/autopsy
Autopsy bugixes
2016-11-14 14:47:52 -06:00