Commit Graph

21705 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
Datraen
9872f20d78 Merge pull request #859 from Neerti/1/26/2016_ling_fixes
Minor Changeling fixes
2016-01-26 12:06:41 -05:00
Mark9013100
93148c27c3 Adds/edits a few cargo crates 2016-01-26 05:04:45 -05:00
Neerti
68f57a3980 Absorbed lings should stay dead now.
Cleans up some comments I forgot to remove.
2016-01-26 02:04:27 -05:00
Neerti
413b6578b4 Merge pull request #850 from Kelenius/lingRuntimeFix
Fixes a roundstart runtime
2016-01-26 01:54:59 -05:00
Kearel
5727971690 Semi ports Baystation12/Baystation12#11445 2016-01-25 20:35:52 +00:00
Zuhayr
e65af989b5 Merge pull request #854 from Datraen/BayCherryPickTest
Fixes supply beacons. (#849)
2016-01-26 05:28:47 +10:30
ccomp5950
283871bfa1 Fixes supply beacons.
Just because it's not active doesn't mean you kill the process, this removes the item from processing later when it is activated.

Fixes #11925
2016-01-25 13:29:31 -05:00
EmperorJon
98f2a26679 Merge pull request #845 from Datraen/LingHelmetSpriteFix
Fixes #839
2016-01-25 16:40:10 +00:00
Kelenius
883013db81 Fixes a roundstart runtime 2016-01-25 18:11:14 +03:00
Datraen
dcf2e5cb6b Fixes the hang up button. 2016-01-24 23:12:53 -05:00
Datraen
5b9cab5f9a Changes ling armored helmet to the proper sprite. 2016-01-24 22:33:57 -05:00
Datraen
3181e8aeeb Merge pull request #797 from Kelenius/lathefix
Fixes #94
2016-01-24 18:19:48 -05:00
EmperorJon
37ee02c110 Merge pull request #836 from Datraen/BayCherryPickTest
Cherrypicks from Bay
2016-01-24 15:22:44 +00:00
EmperorJon
4fdd2c09a8 Merge pull request #837 from Datraen/MutantLaserRepair
Fixes #828
2016-01-24 15:22:29 +00:00
Zuhayr
9bf30a4e7a Fixes odd synth brain bugs. 2016-01-24 15:11:33 +10:30
Datraen
28e48e1c6a Fixes #828 2016-01-23 22:51:04 -05:00
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
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
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
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