cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-25 16:54:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,699 Commits 2 Branches 1 Tag
acd290ddcfdf2bb4acaa08b2ad3f688ea3b26a79
Commit Graph

7402 Commits

Author SHA1 Message Date
PsiOmega
fc5d33917b Attempts to ensure that the captain (or the head loyalist to be precise, whomever he might be) is not a candidate for the directives. 2014-07-27 23:32:36 +02:00
Walter0o
df6ac58d84 fixes nullpointer caused by broken organ list pt 2 
more a prevention than a fix, but meh
 2014-07-26 13:08:25 +02:00
DJSnapshot
de282a4e2a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/client/preferences.dm
 2014-07-25 17:19:59 -07:00
DJSnapshot
a4fc2b04a2 fix to allow non-humans to be stunned like they should be. Gosh. (Also, clumsy check and making harmbaton actually work) 2014-07-25 16:56:56 -07:00
Chinsky
f33e11383b Merge pull request #5751 from DJSnapshot/hotfix 
Bug Fixes!
 2014-07-26 03:28:54 +04:00
DJSnapshot
ec238be981 Revert and fix for e-nets. 2014-07-25 16:23:26 -07:00
Zuhayr
57b790ad92 Merging. 2014-07-25 22:50:35 +09:30
Zuhayr
99909e3aba Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-25 22:47:57 +09:30
Zuhayr
f2f9a5afc4 Removes the flying baton of justice. 2014-07-24 15:21:57 +09:30
DJSnapshot
75c1a4bac3 Disabling E-nets after admin discussion. 2014-07-23 21:26:12 -07:00
DJSnapshot
25bd9c3187 fixes #4961 2014-07-23 21:12:03 -07:00
Ccomp5950
569e8361dc Crew Monitor will no longer show "weird characters" 
It has been talked to and feels very sorry for it's actions.

Well that and NanoUI doesn't like byond text-macros (/improper) in this case, so we just sanitize it just incase the crew monitor isn't playing nice that day.
 2014-07-22 20:21:22 -05:00
Chinsky
f51c377626 Merge pull request #5713 from Hubblenaut/master 
Economy and Engineering Access Fixes
 2014-07-22 10:56:39 +04:00
Zuhayr
1ba147d9da Cleaning up the previous commit a little. 2014-07-21 16:22:19 +09:30
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Zuhayr
6b51645283 Merge pull request #5704 from mwerezak/species-refit 
Fixes object icons not being updated when refitting hardsuits for different species
 2014-07-21 16:09:47 +09:30
Zuhayr
6b247da537 Merge pull request #5695 from Walter0o/odysseus_fix 
should fix #5692
 2014-07-21 16:01:10 +09:30
Hubblenaut
c62e38b4cd Vending machines don't vend on suspended accounts 2014-07-20 18:38:08 +02:00
mwerezak
e9772faabc Fixes skrell helmet refitting, modkit text 2014-07-20 11:34:46 -04:00
Chinsky
0ac240f4f8 Merge pull request #5669 from atlantiscze/laptop-multifix 
Laptop MultiFix
 2014-07-20 17:58:24 +04:00
Chinsky
02227d9da7 Merge pull request #5700 from Whitellama/master 
Bug fixes: #5697, #5690, #5687, #5685
 2014-07-20 17:42:23 +04:00
Walter0o
3334900987 adds trim() to OOC and LOOC 2014-07-20 06:57:57 +02:00
mwerezak
789d3e4d54 Fixes modkits 
Fixes modkits not tracking suit/helmet parts, not checking allowed
parts, and not checking if the clothing needs to be modified.
 2014-07-19 23:17:35 -04:00
Whitellama
266d8d25fa Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting 2014-07-19 19:11:30 -07:00
mwerezak
e8c4ad07bb Adds a system for refitting species clothing 2014-07-19 22:08:31 -04:00
Whitellama
342a187c8b Eating with utensils now produces the eating sound, fixed #5687 2014-07-19 18:33:30 -07:00
Atlantiscze
69ab22896b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into laptop-multifix 2014-07-20 02:07:15 +02:00
Atlantiscze
5cfe7d9dd8 Fixes #5670 
- This also includes other vending machines than laptop vendor. They now actually take money from your account instead of pretending to do so and giving stuff for free. No moar spess communism.
- Vending machines now ask for PIN code only if your account settings require it (ie: Security levels 1 or 2. Default is 0 - only ID card swipe)
 2014-07-20 01:55:11 +02:00
Walter0o
361609cacd should fix #5692 
untested, but seems like a simple derp bug
 2014-07-19 23:22:28 +02:00
Chinsky
f83b9b4eed Merge pull request #5681 from mwerezak/looc 
Fixes #5666
 2014-07-19 00:33:08 +04:00
mwerezak
b3a99cefcf Fixes #5666 2014-07-18 16:16:43 -04:00
Mloc-Hibernia
281a26b979 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 13:08:12 +00:00
mwerezak
7361c7da45 Loosens the undocking requirements for airlocks 2014-07-17 22:03:05 -04:00
mwerezak
3ea7e0ce3c Adds a name for the escape pod controller 2014-07-17 20:07:13 -04:00
mwerezak
21b2742086 Adds default values for some docking tags 
Simplifies the mapping of docking controllers by cutting down on the
number of tags needed to be entered.
 2014-07-17 20:01:20 -04:00
Atlantiscze
72dbce88ce Fixes #5570 
Also de-copypasted charger code, as i had the opportunity.
 2014-07-17 18:01:19 +02:00
Chinsky
248affdebe Merge pull request #5656 from mwerezak/wound-infections 
Infection system tweaks
 2014-07-17 15:39:16 +04:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
1eee72d118 Updates body scanner readout for internal organs 2014-07-16 15:59:18 -04:00
mwerezak
d6a070e6fc Improved full body scanner infection readout 
Now provides a higher level of precision on infection severity.
 2014-07-16 15:44:16 -04:00
Walter0o
6c62e9e56b should fix #5618, trivial kitchen utensil bug 2014-07-16 20:28:19 +02:00
Chinsky
47a61c66a7 Merge pull request #5629 from mwerezak/throwing 
Fixes #5586
 2014-07-16 12:19:15 +04:00
Chinsky
a7379f925a Merge pull request #5634 from Whitellama/master 
Made LOOC show character names of living players, fixing #5633
 2014-07-16 12:18:49 +04:00
Chinsky
857cbe23bf Merge pull request #5635 from mwerezak/air-alarm-fix 
Fixes air alarms not updating icons, fixes siphoning or cycling being stopped even though environmental mode is set
 2014-07-16 12:17:52 +04:00
mwerezak
a4bef09a69 Fixes air alarm icons not updating 
I'm not sure how I missed that the first time.
 2014-07-15 18:27:15 -04:00
mwerezak
c469b188ee Fixes air alarms not siphoning or cycling 2014-07-15 16:35:03 -04:00
Whitellama
8ec8c615e4 Made it so admins see global LOOC character names/BYOND keys based on whether that player is alive/dead 2014-07-15 13:33:52 -07:00
mwerezak
90f7029f4e Adjusts the volume change in space 
Did some playtesting with energy guns and revolvers in space.
 2014-07-15 16:26:05 -04:00
Whitellama
866a486ad6 Made LOOC show character names of living players and BYOND keys of observing/dead players 2014-07-15 12:55:21 -07:00
mwerezak
005c6589c2 Limits hearing sounds in a vacuum 2014-07-15 15:30:10 -04:00