Commit Graph

24264 Commits

Author SHA1 Message Date
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
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
20b6d4be57 Merge pull request #2718 from Anewbe/teargas
Adds teargas grenades, currently aspawn only
2016-11-15 20:05:35 -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
MagmaRam
60991eacb9 Merge pull request #2744 from Anewbe/loadout
Adds flashlights to loadout
2016-11-15 20:01:49 -06:00
MagmaRam
890590d89e Merge pull request #2743 from Anewbe/sleeper
Fixes a sleeper bug
2016-11-15 20:01:43 -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
726015fcd2 Fixes the silent ERT 2016-11-15 18:27:40 -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
4a7f88555a Adds flashlights to loadout 2016-11-14 17:55:53 -06:00
Anewbe
f646eeaca1 Fixes a sleeper bug 2016-11-14 15:55:31 -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
MagmaRam
8240974ca2 Merge pull request #2740 from Anewbe/autopsy
Autopsy bugixes
2016-11-14 14:47:52 -06:00
Anewbe
8e5f9444f7 Fixes the autopsy scanner bugging on print 2016-11-14 14:14:25 -06:00
Anewbe
aa93f8436e Projectiles now log for autopsy reports 2016-11-14 14:14:10 -06:00
Anewbe
f7c85b7229 Flashlights in rechargers 2016-11-13 22:33:36 -06:00
Anewbe
2899f65653 Merge pull request #2720 from VOREStation/defib
Defibrilator Kit
2016-11-13 16:19:21 -06:00
Anewbe
189a9a4329 Brand disks now come in their own crates, prices increased 2016-11-13 16:03:03 -06:00