cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,186 Commits 2 Branches 1 Tag
d0b3a3a39bf033d8b186ced6c3b3792f2f369a1c
Commit Graph

15096 Commits

Author SHA1 Message Date
Zuhayr
d0b3a3a39b Merge pull request #6601 from Mloc/bs12-calert 
donut boxes now update their icon to properly reflect their contents
 2014-10-06 19:37:24 +10:30
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-05 19:24:30 +01:00
Zuhayr
77917fb2c4 Merge pull request #6584 from Iamgoofball/patch-6 
quick fix for #6498
 2014-10-05 10:10:50 +10:30
Chinsky
41ce4fc57d Merge pull request #6588 from RavingManiac/dev 
Sniper scope improvements, binoculars
 2014-10-05 03:37:33 +04:00
Zuhayr
fe950a6457 Merge pull request #6589 from Gamerofthegame/Project-Thief 
Project thief
 2014-10-05 10:05:39 +10:30
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
mwerezak
db113115c6 Allows removing passengers through maint protocols 2014-10-04 02:07:15 -04:00
Gamerofthegame
40b73c5538 Fixes compile error 2014-10-03 17:24:40 -04:00
Gamerofthegame
447083d94c Adjusts bomberjacket 2014-10-03 16:11:11 -04:00
RavingManiac
2aab019cba Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self(). 2014-10-04 04:05:26 +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
PsiOmega
1905100909 Merge remote-tracking branch 'upstream/dev' into Central 2014-10-03 13:40:18 +02:00
Chinsky
d79e8b4978 Merge pull request #6581 from PsiOmegaDelta/ChargingLasah 
Fixes #6575 and a few other issues
 2014-10-03 15:34:18 +04:00
PsiOmega
ae5ff3972a Merge remote-tracking branch 'upstream/dev' into Central 2014-10-03 13:20:25 +02:00
PsiOmega
e1168271c8 Divides central primary hallway 
Divides central primary hallway into 3 area-sub sections, reducing the impact of automatic breach control, etc.
 2014-10-03 10:38:39 +02:00
Iamgoofball
a5dacfc5bd Update boxes.dm 2014-10-02 16:35:44 -07:00
Iamgoofball
29621e9f2c quick fix for #6498 2014-10-02 16:34:48 -07:00
Zuhayr
e283fa850f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-03 06:58:53 +09:30
Mloc
87a0b4b6c7 Merge pull request #6580 from PsiOmegaDelta/Detomax 
Fixes #6546
 2014-10-02 21:21:44 +01:00
PsiOmega
548985c40b Fixes #6575 and a few other issues 
E-magging a bot, any bot, now produces adming logs.
Now plays a sound when an ED-209 fires its laser.
ED-209 no longer transform into Beepsky when attacking simple animals
ED-209 can again use its laser.
 2014-10-02 20:22:01 +02:00
PsiOmega
fd060cc5fe Fixes #6546 
Replaces iffy cartridge type checks with access checks.
 2014-10-02 09:29:04 +02:00
PsiOmega
e9581c823c Fixes the CMO's doors 
The CMO's remote door control should now work again.
The CMO's doors are now powered by the ACP in his office.
The command staff now have offices, don't quarters. Felt a bit generous to call them such.
 2014-10-02 08:21:08 +02:00
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
Chinsky
dd9b3fe613 Merge pull request #6565 from Mloc/bs12-fan 
small fixes 2
 2014-10-01 13:39:35 +04:00
Chinsky
a3dba06c0e Merge pull request #6563 from mwerezak/cargo 
Fixes supply shuttle state when returning
 2014-10-01 13:39:29 +04:00
Zuhayr
c3e63b1ad0 Merge pull request #6560 from Mloc/bs12-efab 
small fixes
 2014-10-01 18:52:59 +09:30
Mloc
ee4eafa660 fixes #6090 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 10:17:55 +01:00
Mloc
d43dbaa7b5 resolves #6260 
chance was being checked twice, for some reason.

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 10:13:15 +01:00
Zuhayr
cc21a1b405 Muzzle check/changeling check removal, thanks Harpy. 2014-10-01 18:32:24 +09:30
Mloc
39781326cc fix for artifact teleportation effect 
will no longer teleport you inside random objects.

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 09:54:39 +01:00
Zuhayr
3f05362577 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-10-01 18:16:04 +09:30
Mloc
bb2953b283 re-port trange() from tg 
was lost in the multiz update

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-01 08:50:28 +01:00
Chinsky
a26185dd9e Merge pull request #6553 from atlantiscze/android-roundstart-fix 
Android roundstart fix
 2014-10-01 10:01:39 +04:00
Chinsky
165bbadc10 Merge pull request #6551 from RavingManiac/dev 
Space floating effect
 2014-10-01 10:01:25 +04:00
Chinsky
701e97960a Merge pull request #6554 from PsiOmegaDelta/RoundEnd 
Round-end summary now also lists job
 2014-10-01 10:01:07 +04:00
mwerezak
d81670edfb Fixes supply shuttle state when returning 
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
 2014-10-01 00:48:16 -04:00
Mloc
f9fa7efe6e fixes #6550 
computer circuits now use paths instead of strings

Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 23:48:54 +01:00
PsiOmega
f95d6f36b9 Manifest ghosts are now given an assigned role to go with the round end summary. 2014-10-01 00:22:13 +02:00
Mloc
61394d3921 fixes #6561 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 22:18:25 +01:00
Zuhayr
d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
Mloc-Argent
3a0289d4ec fixes #6329 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:02 +01:00
Mloc-Argent
1bc57f43f6 optimize secbots a tiny bit 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:01 +01:00
Mloc-Argent
6fb1667b44 fixes #4742 
not a full fix, there's too many small cases where OPENCONTAINER
isn't checked, but this is everything in the report

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:52:00 +01:00
Mloc-Argent
4160488ed1 fix gas overlays persisting after rebuilds 
slight visual artifact when zones are rebuilt, overlays will be
missing until the end of the current tick.  otherwise works fine.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:51:59 +01:00
Mloc-Argent
43546fe9f0 fix stretched lighting 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-09-30 20:51:58 +01:00
Mloc
7a0b0c4369 fixes #6115 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:39:11 +01:00
Mloc
277335f487 fixes #6541 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-09-30 20:13:41 +01:00