Commit Graph

21984 Commits

Author SHA1 Message Date
Zuhayr
8f3b545b10 Merge pull request #815 from Kelenius/qdeltest
Optimizes asteroid generation
2016-01-22 01:50:37 +10:30
Zuhayr
7901d97f09 Merge pull request #809 from Earthcrusher/EC_new_borgie_sounds
Adds two new sounds little borgie butts can make: *yes and *no.
2016-01-22 01:49:37 +10:30
Zuhayr
36c0bb0f13 Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-22 01:33:09 +10:30
Zuhayr
1c100bf457 Cleaning up post-merge. 2016-01-22 01:22:49 +10:30
Neerti
17dcb5ede1 Merge pull request #811 from Zuhayr/gunhands
Added functionality for two-handed gun use.
2016-01-21 09:12:40 -05:00
Earthcrusher
1e93d6e408 Allowed humanoid FBPs to use the new borg sounds as well. Added entries for "yes" and "no" to the synthetic *help list. 2016-01-21 02:48:15 -06:00
Kelenius
9f7b65faf8 Optimizes asteroid generation 2016-01-21 11:42:18 +03:00
Datraen
8c9ee94eb8 Merge pull request #808 from Yoshax/mobfix
Fixes #796
2016-01-20 21:15:18 -05:00
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
EmperorJon
fb7b4cc0ed Merge pull request #807 from Yoshax/canisterfix
Canisters now work in unpowered areas.
2016-01-20 02:44:15 +00:00
Zuhayr
79e06e5ad4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2016-01-20 08:33:56 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Yoshax
f87b120dd5 Fixes #796 2016-01-19 19:11:05 +00:00
Earthcrusher
41df41e549 Adds two new sounds little borgie butts can make, *yes and *no. 2016-01-19 12:59:00 -06:00
ccomp5950
a0fa96c22f Canisters now work in unpowered areas. 2016-01-19 14:53:51 +00:00
Zuhayr
930fcccb97 Properly cleans up the mmi_holder Destroy() proc. 2016-01-19 21:46:07 +10:30
Kelenius
138850a37b Fixes for vendors 2016-01-18 17:40:20 +03:00
Kelenius
671b3b2d96 Removes copypaste 2016-01-18 16:04:01 +03:00
Szunti
2f93947e59 Simplify slime temperature damage
Currently the damage-temperature curve is not continuous and isn't monotone.
It's better to change it to constant 30 damage between -50°C and 50K.
The exact shape of the function is not that important, because the slimes
resistance is mostly due to its bodytemperature need time to change.
2016-01-18 13:57:45 +01:00
Kelenius
ee531578d7 Fixes #94
Protolathe and CI will now correctly eject materials.
2016-01-18 15:06:33 +03:00
Neerti
3d562f0085 Merge pull request #793 from Zuhayr/master
Actually fixes #673.
2016-01-17 03:16:34 -05:00
Zuhayr
1acb009c6a Merge pull request #791 from Dibasic/patch-5
antique laser description typo fix
2016-01-17 18:44:17 +10:30
Zuhayr
e1ca3950b0 Actually fixes #673. 2016-01-17 18:35:09 +10:30
Dibasic
6b77ec868e antique laser description typo fix
there wasn't a period this adds a period
2016-01-16 18:02:41 -06:00
Yoshax
b558fb795f Changes observe message to reflect correct respawn timer 2016-01-16 23:10:15 +00:00
Hubblenaut
39cdd540fe Center_of_mass for snacks/dishes 2016-01-16 19:45:17 +01:00
Neerti
1fe02fc7e8 Merge pull request #787 from Mark9013100/1/14/2016cloadoutclar
Clarifies a few custom loadout items
2016-01-15 22:41:17 -05:00
Neerti
02b8599123 Merge pull request #739 from Datraen/Trayfix
Allows trays to drop their items, adds color to material items on trays
2016-01-15 22:40:54 -05:00
Mark9013100
ea6231215f Clarifies a few custom loadout items 2016-01-15 12:29:07 -05:00
Datraen
460075b360 Slight optimization in dropped, adds colors to material items. 2016-01-14 18:29:49 -05:00
Neerti
23aa869e8a Revert "Removes gun firing logs due to possible lag." 2016-01-14 00:27:06 -07:00
Zuhayr
a4ac982d79 Merge pull request #772 from Mark9013100/1/12/2016portafreezer
Adds portable freezers to med lockers
2016-01-14 07:39:44 +10:30
Yoshax
eda657a272 Adds orange and violet hairflower pins 2016-01-13 19:51:37 +00:00
Datraen
daeba35c6d Merge pull request #778 from Zuhayr/polaris
Fixes.
2016-01-13 14:18:24 -05:00
Datraen
075343c62d Gives implants show_messages access. 2016-01-13 12:48:09 -05:00
Zuhayr
e92615bc24 Robotic limbs and non-DNA mobs will now respect gendered icons. 2016-01-14 01:44:23 +10:30
Zuhayr
7d1aa59de6 Fixes #715 2016-01-14 01:08:21 +10:30
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
887c174926 Fixes #260 2016-01-14 00:17:50 +10:30
Zuhayr
ff798be5c5 Fixes #676 2016-01-14 00:12:47 +10:30
Zuhayr
c0889f09e0 Fixes #728 2016-01-13 23:59:12 +10:30
Zuhayr
18e4c7fa8e Fixes #776 2016-01-13 23:57:38 +10:30
Zuhayr
a3e5649523 Fixes #755 2016-01-13 23:51:45 +10:30
Zuhayr
004687abaa Merge pull request #708 from Hubblenaut/coffee
Coffee Shop
2016-01-13 23:34:10 +10:30
Zuhayr
98352cf09c Merge pull request #767 from EmperorJon/12_Jan._Mask_coverage_fixes
Fixes mask coverage
2016-01-13 23:23:34 +10:30
Hubblenaut
42b7acea8b Merge remote-tracking branch 'upstream/master' into coffee 2016-01-13 02:19:22 +01:00
Mark9013100
21778fc92e Adds portable freezers to med lockers 2016-01-12 19:23:25 -05:00
Hubblenaut
721728d3dd Adds porcelaine cups 2016-01-12 19:42:43 +01:00
Jon
9a303ea576 Fixes mask coverage. 2016-01-12 18:21:29 +00:00