cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-24 08:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,381 Commits 2 Branches 1 Tag
431d7a25817bbf105ffbd162146dc598fddebdb7
Commit Graph

4406 Commits

Author SHA1 Message Date
Zuhayr
70dd21ab4c Fixes #6704 2014-10-16 15:04:47 +10:30
Zuhayr
9563a54c7d Fixes #6725 2014-10-16 14:38:51 +10:30
Zuhayr
87e0d89e58 Fixes #6726 2014-10-16 14:06:30 +10:30
Zuhayr
ca68281371 Fixes #6727 2014-10-16 14:06:16 +10:30
Zuhayr
adb58be3b0 Fixes #6728 2014-10-16 14:02:10 +10:30
Zuhayr
ff9bd99ee7 Fixes #6731 2014-10-16 13:51:25 +10:30
Zuhayr
b611d6515a Fixes #6732 2014-10-16 13:48:26 +10:30
Mloc
be7d30630d Merge pull request #6697 from Zuhayr/dev-freeze 
Xenos fixes, dev freeze fixes.
 2014-10-13 22:25:22 +01:00
Miniature
894ae39f7f Fix for everyone dying if they don't eat 2014-10-14 05:36:47 +10:30
Zuhayr
01ddc9af6d Added binary to the AI. 2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02 Bunch of xeno fixes, details in PR. 2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6 Fixes #6689 2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417 Fixes #6695 2014-10-13 17:00:26 +10:30
Zuhayr
45d6d6a610 Added Galactic Common to the AI. 2014-10-13 16:45:58 +10:30
Snapshot
9a706864b3 Merge pull request #6688 from Zuhayr/dev-freeze 
Dev freeze fixes
 2014-10-12 18:07:34 -07:00
Zuhayr
fa51820244 Fixes #6684 2014-10-13 11:19:12 +10:30
Zuhayr
9c39936640 Fixes #6682 2014-10-13 11:10:46 +10:30
DJSnapshot
b53a89e608 disable typing indicator. 2014-10-12 17:22:30 -07:00
Zuhayr
413af81b80 Fixes humans being able to shred everything with their teeth. 2014-10-12 13:28:46 +10:30
Zuhayr
c9e948095c Thought I had done these before, turned out I did. Single-linebreak conflicts woo. 2014-10-12 11:55:33 +10:30
Zuhayr
5989a0c625 Alien attack_hand() conflicts out the wazoo. I thought I already did these but that may have been on an unmerged branch. Burn that bridge when I come to it. 2014-10-12 11:48:54 +10:30
Zuhayr
72924e80a5 Merge pull request #6666 from GinjaNinja32/nanoui 
Move NanoUI cache update to client/New()
 2014-10-12 04:40:34 +10:30
Gamerofthegame
be8c62de7b Merge 2014-10-11 13:58:16 -04:00
GinjaNinja32
08b967c9e0 Move NanoUI cache update to client/New() 2014-10-11 18:40:09 +01:00
Chinsky
513df67d5f Merge pull request #6650 from mwerezak/grab 
Fixes #6647
 2014-10-11 02:44:59 +04:00
Zuhayr
9b23315359 Fixes #6644 2014-10-11 07:44:48 +10:30
Zuhayr
92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
mwerezak
7a81e116d2 Fixes #6647 
grabbed_by assignment is now done in the grab constructor, instead of
leaking out all over the place.
 2014-10-10 00:23:03 -04:00
Mloc
5b71ca0aeb fixes #6200 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-09 12:35:11 +01:00
Gamerofthegame
02d539eb99 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into working 2014-10-08 18:48:59 -04:00
Zuhayr
4e5d8b787e Minor change based on diff 2014-10-09 06:18:49 +10:30
Gamerofthegame
dd32255c0f Adds another AI sprite 2014-10-08 14:39:02 -04:00
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
1249fb0592 Fixes #6628 2014-10-08 21:18:00 +10:30
Snapshot
ee72baac69 Merge pull request #6618 from Zuhayr/dev 
Bunch of minor fixes for xenomorphs and borer husks.
 2014-10-06 16:36:30 -07:00
Zuhayr
8841e9282f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2014-10-07 10:06:03 +10:30
Zuhayr
2b3e3667d4 Minor fixes for previous commit, implemented default species languages. 2014-10-07 09:51:48 +10:30
Zuhayr
96e57fc091 Bunch of minor fixes for xenomorphs and borer husks. 2014-10-07 08:54:05 +10:30
PsiOmega
d6030024d1 Fixes #6180 
Changing AI eye location now disables tracking by default, unless explicitly stated otherwise.
 2014-10-06 15:57:52 +02:00
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Chinsky
41ce4fc57d Merge pull request #6588 from RavingManiac/dev 
Sniper scope improvements, binoculars
 2014-10-05 03:37:33 +04:00
GinjaNinja32
24d43ef509 Fixes #6597 2014-10-04 18:15:13 +01:00
GinjaNinja32
9ac8f3ccef Fixes #6587 and #6590 2014-10-04 17:57:37 +01:00
RavingManiac
756e9ae030 Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle. 2014-10-04 17:38:38 +08:00
Gamerofthegame
a47ec82103 Merge repair 2014-10-03 16:04:31 -04:00
RavingManiac
f0da0380a5 Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu. 
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
 2014-10-04 04:01:56 +08:00
Zuhayr
a0ad04f520 Merge pull request #6564 from TwistedAkai/master 
Add round start check to Declare Ready
 2014-10-02 11:44:07 +09:30
Zuhayr
6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Zuhayr
3fd8b64f86 Added new diona icons, added heat to alien life(), added fire indicator. 2014-10-01 22:21:34 +09:30