Commit Graph

13586 Commits

Author SHA1 Message Date
Zuhayr
eef9145486 Revert "Removes Resomi."
This reverts commit c9f579e00a.
2016-01-27 13:48:48 +10:30
Yoshax
ed4bc0264e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gameport2 2016-01-26 17:26:51 +00:00
Datraen
0a27121a53 Merge pull request #789 from Hubblenaut/master
Center_of_mass for snacks/dishes
2016-01-26 12:16:53 -05:00
Zuhayr
d5b904ca2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris 2016-01-26 11:11:55 +10:30
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Datraen
b084d6b9da Uses the correct operator. 2016-01-24 18:21:23 -05:00
Datraen
3181e8aeeb Merge pull request #797 from Kelenius/lathefix
Fixes #94
2016-01-24 18:19:48 -05:00
Datraen
fb096a4f59 Adds roll-able sleeves, switchable eyepatch. 2016-01-24 17:05:48 -05:00
EmperorJon
37ee02c110 Merge pull request #836 from Datraen/BayCherryPickTest
Cherrypicks from Bay
2016-01-24 15:22:44 +00:00
Zuhayr
9bf30a4e7a Fixes odd synth brain bugs. 2016-01-24 15:11:33 +10:30
Spamcat
588e072b9d Fixes #11681 2016-01-23 20:33:50 -05:00
ccomp5950
f65581b1c8 Fixes #10942
The portion that generates the list just performs a null check, not a length check.
So we initialize it as null instead.
2016-01-23 20:27:57 -05:00
Jon
cbbb1f8344 Fight me 2, fight me boogaloo. 2016-01-24 00:47:52 +00:00
Jon
706d720757 Fight me etc. 2016-01-24 00:35:23 +00:00
Neerti
d5cefa6384 Merge pull request #824 from Mark9013100/1/22/2016actionbuttons
Adds action buttons for hard-hats and goggles
2016-01-22 22:59:08 -05:00
Mark9013100
8194c3ca61 Adds action buttons for hard-hats and goggles 2016-01-22 20:27:58 -05:00
Atlantis
58b9ec24ea Allows AIs to send emergency messages to central
- This is probably more of a bugfix than feature, since the actual code that allows message sending seems to already be in there.
- Requested by Minijar.
2016-01-22 18:49:47 +01:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
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
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
Zuhayr
930fcccb97 Properly cleans up the mmi_holder Destroy() proc. 2016-01-19 21:46:07 +10:30
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
Zuhayr
1acb009c6a Merge pull request #791 from Dibasic/patch-5
antique laser description typo fix
2016-01-17 18:44:17 +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
Mark9013100
ea6231215f Clarifies a few custom loadout items 2016-01-15 12:29:07 -05:00
Neerti
23aa869e8a Revert "Removes gun firing logs due to possible lag." 2016-01-14 00:27:06 -07:00
Yoshax
eda657a272 Adds orange and violet hairflower pins 2016-01-13 19:51:37 +00: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
18e4c7fa8e Fixes #776 2016-01-13 23:57:38 +10:30
Zuhayr
a3e5649523 Fixes #755 2016-01-13 23:51:45 +10:30