cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-20 07:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 2 Branches 1 Tag
fe0e1ecfb65efbdd1069affe77a73c048a39f02c
Commit Graph

13651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Apples
3ce6514073 Re-enables....something... 
huhuhuhu

Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-21 20:15:14 +01:00
Chinsky
a4325d69eb Fixes for runtimes and viruses staying in blood after curing. 2013-06-21 21:37:20 +04:00
jupotter
97955c7ee2 Updated changelog 2013-06-21 17:38:30 +02:00
jupotter
f8458f13f4 Fix robotics on char setup screen 
Robotics is no longer in engineering, but in medsci
 2013-06-21 17:29:37 +02:00
Jim Apples
ec43741f2f Changed the vote sound as discussed by admins, and made it so that -all- votes (Not just crew transfer) automatically disable OOC. 
Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-21 14:40:36 +01:00
Jim Apples
539b2f2219 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-21 12:47:28 +01:00
Chinsky
32ca15fdb4 Merge pull request #3121 from Zuhayr/master 
Alien resin wall fix.
 2013-06-21 03:41:16 -07:00
Zuhayr
476c8f2fcd Fix for destroying alien walls with your bare hands. 2013-06-21 19:03:12 -07:00
Zuhayr
1b5b035630 Fixes #2421 2013-06-21 15:38:44 -07:00
Zuhayr
d1e80194e3 Fixes #2921 2013-06-21 15:22:04 -07:00
Zuhayr
afece7e56e Fixes #3118 2013-06-21 15:07:31 -07:00
Zuhayr
d0267a07d2 Fixes #3106 2013-06-21 06:43:24 -07:00
Chinsky
dd8ae321f9 Merge pull request #3119 from CIB/bleeding-edge-freeze 
Lowered organ max damage across the board.
 2013-06-21 01:14:29 -07:00
Chinsky
c418712ef3 Merge pull request #3120 from Zuhayr/feature 
Fixes plus arm-exploding changes.
 2013-06-21 01:12:09 -07:00
Zuhayr
7389d843fc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:49 -07:00
Zuhayr
fa5202c5ed Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-21 18:06:36 -07:00
Zuhayr
a16c8e0595 Fixes #3081 2013-06-21 18:00:25 -07:00
Zuhayr
cffb7a40bd Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-21 06:01:59 -07:00
Zuhayr
f38865f0de Added a dart gun and sprites. 2013-06-21 06:01:39 -07:00
Zuhayr
298be9107c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-21 01:46:27 -07:00
Zuhayr
0d35284d50 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-21 01:46:10 -07:00
cib
b4c6fc306f Lowered organ max damage across the board. 
As it was, the only way for organs to be detached was when you were dead.
 2013-06-21 10:00:51 +02:00
Chinsky
e46e3737bc Merge pull request #3112 from Zuhayr/feature 
Dart gun, darts, fixes from master.
 2013-06-21 00:03:21 -07:00
Chinsky
2cf633b34f Merge pull request #3113 from Zuhayr/master 
Firesuit icon fix.
 2013-06-20 23:54:00 -07:00
Chinsky
32fd044e52 Merge pull request #3103 from AppleMaster/bleeding-edge-freeze 
I don't know what I broke
 2013-06-20 23:51:30 -07:00
Jim "Apples"
45c28ece8d Merge pull request #3108 from Kilakk/bleeding-edge-freeze 
Adds auto OOC mute for crew transfer votes
 2013-06-20 08:47:53 -07:00
Jim "Apples"
3b36a02bf0 Merge pull request #3111 from Spamcat/master 
MEATFIX
 2013-06-20 07:15:37 -07:00
Spamcat
654a83be9d Quickfix for INFINIMEAT. 2013-06-20 18:13:18 +04:00
Spamcat
2b348eaa3e Phasing out world loops, pt 1 2013-06-20 17:21:16 +04:00
meyar
62de149dc4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-20 01:51:41 -04:00
Kilakk
516c2697cd Adds auto OOC mute for crew transfer votes 2013-06-19 19:48:03 -04:00
Jim "Apples"
b57e0904ec Merge pull request #3105 from SkyMarshal/airfixes 
Sanity checking for zone disconnection.  I am dumb some days.
 2013-06-19 14:24:20 -07:00
SkyMarshal
73bf813127 Sanity checking for zone disconnection. I am dumb some days. 2013-06-19 12:47:19 -07:00
Jim Apples
36a6be989e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-19 17:57:16 +01:00
Jim "Apples"
8b50deb13f Merge pull request #3054 from comma/manup 
Manup
 2013-06-19 09:55:22 -07:00
Jim Apples
a23e1c7a92 Added 5 barsigns. 
Signed-off-by: Jim Apples <cheeckan@gmail.com>
 2013-06-19 17:51:41 +01:00
Chinsky
fac34d5217 Merge pull request #3100 from EmperorJon/master 
Ion Storm Law Change
 2013-06-19 08:48:53 -07:00
Spamcat
2624abdaba Secbelts now can hold melee weapons. 2013-06-19 15:08:55 +04:00
Chinsky
36c08d9fd0 Merge pull request #3084 from jack-fractal/bleeding-edge-freeze 
Malsquando's Teacup Replacement Sprite
 2013-06-19 01:43:51 -07:00
Chinsky
0c1fe6f6fa Merge pull request #3099 from Spamcat/bef 
Made hailers emaggable.
 2013-06-19 01:43:32 -07:00
Zuhayr
5def0eda4c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-19 00:23:23 -07:00
Zuhayr
35b909ef3b Fix for dragging. 2013-06-18 23:39:48 -07:00
jack-fractal
4045df96a5 - renaming existing "tea" icon to hot_coco 
- adding "teacup" icon
- revising icon-state for hot coco and tea
 2013-06-19 00:47:12 -04:00
Zuhayr
63b3e44b5c Bug fixes for embedding/pinning code. 2013-06-18 21:24:26 -07:00
Zuhayr
c451f927fc Using BEF map. 2013-06-18 20:38:25 -07:00
Zuhayr
a668c11935 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-18 20:26:13 -07:00
jack-fractal
863f0e2cdf Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-18 21:41:38 -04:00
EmperorJon
4ff64c1190 Changes to some AI Ion Storm Laws. 
Told to do so by Ispil.
 2013-06-19 01:57:38 +01:00
Spamcat
0dfb5a0583 Whoops :/ 2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed Made hailers emaggable. 2013-06-19 02:35:32 +04:00