Commit Graph

14903 Commits

Author SHA1 Message Date
Anewbe
89b8a66a44 Merge pull request #2749 from Yoshax/braindeath
Being unable to breathe and having oxyloss now causes brain damage that scales with your oxyloss
2016-11-16 17:16:33 -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
067a904507 Merge pull request #2754 from MagmaRam/ventcrawl_fix
No longer able to crawl through welded vents.
2016-11-16 16:03:00 -06:00
Anewbe
5f8b538985 Merge pull request #2755 from MagmaRam/weldmaskfix
Fixes welding masks disappearing when flipped wrong.
2016-11-16 16:02:54 -06:00
Anewbe
cdef74bcdc Lightning spells and bioelectrogenesis will no longer stun outright 2016-11-15 21:49:06 -06:00
MagmaRam
6c3c2e3e03 Merge pull request #2737 from Anewbe/more_ap_bullets
More ap bullets
2016-11-15 21:27:22 -06:00
MagmaRam
f0c26f980c Fixes welding masks disappearing when flipped wrong. 2016-11-15 21:09:03 -06:00
MagmaRam
38aa0217f9 No longer able to crawl through welded vents. 2016-11-15 20:56:58 -06:00
Anewbe
35b80e8eae Fixes bears 2016-11-15 20:23:01 -06:00
MagmaRam
35d76b7944 Merge pull request #2741 from Anewbe/armor_slowdown_tweaks
Moves armor set slowdown to torso, from arms
2016-11-15 20:02:31 -06:00
Anewbe
be4aa63263 AP bullets 2016-11-15 19:50:28 -06:00
Anewbe
06fa3927a1 Allows ashtrays to go in the trash. 2016-11-15 19:12:19 -06:00
Kholdstare34
f37251496e Adds several feminine undershirts, tweaks the warden and HoS jumpskirt to bring them in line with the other departmental jumpskirts, and adds white short shorts and a denim skirt. 2016-11-15 19:08:27 -06:00
Anewbe
8bba88cd66 Fixes a few things 2016-11-15 18:15:32 -06:00
Yoshax
4885482d2b Moves the brain into the same place as the other organ files 2016-11-15 21:55:01 +00:00
Yoshax
bff720aede Being unable to breathe and having oxyloss now causes brain damage that scales with your oxyloss 2016-11-15 21:54:43 +00:00
Nerezza
1d66540460 Adds lemon juice to dispensers.
Also adds lemon juice cartridges to cargo's crate.
2016-11-15 12:00:30 -06:00
Anewbe
b9b33018cd Allows emptying of ashtrays into disposals 2016-11-14 22:10:59 -06:00
Anewbe
1778f562d4 Adds Stimm, a homemade hyperzine; makes hyperzine toxic 2016-11-14 20:49:36 -06:00
Anewbe
4a7f88555a Adds flashlights to loadout 2016-11-14 17:55:53 -06:00
MagmaRam
568b1eacfe Slimes will now dump reagents they can't process.
They won't throw up a runtime and then refuse to process more stuff.
2016-11-14 15:51:17 -06:00
Anewbe
585a6b04af Moves armor set slowdown to torso, from arms 2016-11-14 15:09:29 -06:00
MagmaRam
ac81408cf9 Merge pull request #2724 from Anewbe/signing
Ports sign language
2016-11-14 14:51:48 -06:00
MagmaRam
95ae417f21 Merge pull request #2736 from Anewbe/robobrand_cleanup
Robobrand disks now come in their own crates, prices increased
2016-11-14 14:51:36 -06:00
Anewbe
aa93f8436e Projectiles now log for autopsy reports 2016-11-14 14:14:10 -06:00
Anewbe
189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00
MagmaRam
127d26f80e Merge pull request #2735 from Anewbe/borgzaps_again
Robots should not be shocked by wires/machines
2016-11-12 21:45:07 -06:00
MagmaRam
8dae3942f0 Merge pull request #2719 from Anewbe/half_gas
Ports bay's half gasmak
2016-11-12 21:44:24 -06:00
Anewbe
0418911e0b Robots should not be shocked by wires/machines 2016-11-12 21:35:55 -06:00
MagmaRam
5eff6494cd Merge pull request #2712 from Anewbe/turban
Turban doesn't cover beard
2016-11-12 14:17:50 -06:00
MagmaRam
b0aa1a11cd Merge pull request #2715 from Anewbe/loincloth
Fixes loincloth sprite
2016-11-12 14:16:48 -06:00
MagmaRam
1c0ef59dba Merge pull request #2694 from Anewbe/surgery_fix
Fixes some surgery bugs
2016-11-12 13:32:56 -06:00
MagmaRam
7f2e507140 Merge pull request #2721 from Anewbe/taperecorder
Ports Bay's tape recorders
2016-11-12 13:32:29 -06:00
Anewbe
5e9b885b43 Actually fixes the stuff 2016-11-12 11:29:23 -06:00
Yoshax
102c0c2277 Makes clipboards producible out of wood 2016-11-12 01:26:20 +00:00
Anewbe
d3d290b9f3 Merge pull request #2717 from MagmaRam/concealed_carry
Concealed holsters, suits hiding accessories.
2016-11-11 19:08:20 -06:00
MagmaRam
c0486a164f Changed the visible holsters back to not being an entire subclass. 2016-11-11 16:39:17 -06:00
Anewbe
b8018065bc Ports sign language 2016-11-11 15:43:03 -06:00
Arokha Sieyes
5a5a50f7b0 Improves bandanas
No more tie verb. Just put it into whatever slot and it (correctly) adjusts the needed stuff to work. Added 'Can be worn on the head or face' to the description to indicate that.

Currently wearing a bandana on your head makes it impossible to eat, which doesn't make sense, so this fixes that too.
2016-11-11 10:51:35 -05:00
Anewbe
6df4ebe1c7 Makes tox damage more dangerous 2016-11-11 00:24:16 -06:00
Anewbe
da90b87802 Ports Bay's tape recorders 2016-11-11 00:10:55 -06:00
Anewbe
cc2d9d9528 Ports bay's half gasmak 2016-11-10 23:08:29 -06:00
MagmaRam
bff4e6a4e1 Makes clothing actually hide stuff, fixes a couple odd related bugs. 2016-11-10 18:00:31 -06:00
Anewbe
49face1006 Might fix Travis 2016-11-10 17:49:20 -06:00
Anewbe
f9012b6100 Fixes loincloth sprite, removes them from xenogear (they're in shorts selection) 2016-11-10 17:35:44 -06:00
MagmaRam
b418d57dd6 Makes it so that holsters can be hidden by suit-slot items.
I have yet to actually make any suit-slot items hide holsters.
2016-11-09 23:23:19 -06:00
Anewbe
9664e09ae7 Turban doesn't cover beard 2016-11-08 20:43:54 -06:00
Anewbe
5bb82a0e25 Fixes borg shocks 2016-11-07 20:45:15 -06:00
redstryker
c8bf4cfce2 Changelog and Inventory Flags 2016-11-05 18:12:11 -04:00