Commit Graph

14889 Commits

Author SHA1 Message Date
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
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
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
45ed26ed81 Merge pull request #2780 from Anewbe/draw_blood
Drawing blood takes time
2016-11-19 22:20:01 -06:00
MagmaRam
06fcacdd08 Merge pull request #2779 from Nerezza/FinallyInto
Accessories on teshari now use the right sprites
2016-11-19 22:18:26 -06:00
Anewbe
475f41eb48 Merge pull request #2761 from Techhead0/patch-1
Fixes lung rupturing in partial pressure or overpressure
2016-11-19 22:12:48 -06:00
Techhead
b28878d002 Prevents null breaths from rupturing lungs.
For example, if the human mob is in crit.
2016-11-19 17:46:59 -05:00
Anewbe
6530f098d4 No timer on self 2016-11-19 16:41:26 -06: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
8e9416d03e Drawing blood takes time 2016-11-19 14:31:57 -06:00
Nerezza
733f908799 Accessories on teshari now use the right sprites
Teshari can (finally) into webbing, too!

Tested and works, only issue is that any accessories not in seromi/ties.dmi will not be visible. This is how everything but jumpsuits handles things for them anyhow.
2016-11-19 13:15:14 -06:00
Anewbe
a0448aed34 Merge pull request #2771 from Nerezza/statusdate
Yoinks Kasuobes' station date in status
2016-11-19 12:15:29 -06:00
Anewbe
4587beb82b Merge pull request #2776 from Yoshax/booterany
Adds cryogenic stasis to hydroponics trays
2016-11-19 11:34:23 -06:00
Yoshax
31fb2944d6 Changelog 2016-11-19 14:30:46 +00:00
Anewbe
a67e57e727 Simple fix is good fix 2016-11-18 22:32:45 -06:00
Yoshax
737205d945 Adds cryogenic stasis to hydroponics trays 2016-11-19 02:26:39 +00:00
Datraen
7f12558ff3 Supermatter now uses the global announcer.
Global announcer now has access to the engineering channel.
2016-11-19 01:08:46 +00:00
Nerezza
b764991308 Robobrains no longer drop real brains.
This also makes them self-name with their designation like posibrains, so they're easier to identify.
2016-11-18 12:47:43 -06:00
Nerezza
3c5933712f Yoinks Kasuobes' station date in status
Puts the station's current date in the status tab, so hopefully people will stop asking ;)

This was originally made by Kasuobes for Bay.
2016-11-18 11:46:15 -06:00
MagmaRam
f7f2b7837d Merge pull request #2764 from Anewbe/rig_sprint
Adds hardsuit sprint module
2016-11-17 20:41:17 -06:00
MagmaRam
5f34a2faea Merge pull request #2757 from Nerezza/LemonBranch
Adds lemon juice and milk to the bar.
2016-11-17 19:38:40 -06:00
MagmaRam
db14cb66c2 Merge pull request #2763 from Anewbe/helmets
Armor can hold helmets in suit storage
2016-11-17 19:38:06 -06:00
Anewbe
e30b96421f Adds hardsuit sprint module 2016-11-17 18:30:40 -06:00
Anewbe
656f3c1c96 Merge pull request #2766 from MagmaRam/xenobio_again
Xenobio again
2016-11-17 17:00:12 -06:00
Datraen
d69f9557ce Make cameras great again 2016-11-17 10:42:52 -05:00
MagmaRam
2c231333e6 Fixes xenobio chem stuff properly this time 2016-11-17 07:10:59 -06:00
Anewbe
ba1225048e Armor can hold helmets in suit storage 2016-11-16 22:43:32 -06:00
MagmaRam
059d9b5126 Merge pull request #2762 from Anewbe/surgery_fix_again
Another glorious surgery bugfix
2016-11-16 21:57:13 -06:00
MagmaRam
1ebd605ecc Merge pull request #2758 from Anewbe/necrophilia
CPR can be (pointlessly) done on dead people
2016-11-16 21:54:52 -06:00
MagmaRam
2f57ca24dc Merge pull request #2747 from Anewbe/ashtray
Allows emptying of ashtrays into disposals
2016-11-16 21:54:16 -06:00
Anewbe
7538cfbe45 Another glorious bugfix 2016-11-16 20:48:04 -06:00
Techhead
070498e913 if(prob()), not if prop()
Dumb typos are dumb.
2016-11-16 21:06:33 -05:00
Techhead
9024854e1f Fixes lung rupturing in partial pressure or overpressure
Also deals with a runtime
2016-11-16 19:36:18 -05:00
Nerezza
e1fcdabdf9 Renames the bar's milk carton
It's larger than normal, so it's a large milk carton.
2016-11-16 17:37:07 -06:00
Anewbe
7d532f573e Merge pull request #2751 from Kholdstare34/outbox
Clothing additions, minor clothing tweaks, and undershirts
2016-11-16 17:29:36 -06:00
Anewbe
3470c4eb28 CPR can be (pointlessly) done on dead people 2016-11-16 17:23:37 -06:00
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
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