cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 00:22:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,372 Commits 2 Branches 1 Tag
24f7c0ca2cac15f9aa55e32b50ec4162d563dfb3
Commit Graph

22674 Commits

Author SHA1 Message Date
PsiOmega
daef0ccec8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-28 11:27:20 +02:00
PsiOmega
ff7a4fc244 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/events/event_container.dm
 2015-08-28 11:18:57 +02:00
Chinsky
c642e8c729 Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs 
Improved admin logging.
 2015-08-28 10:32:35 +03:00
PsiOmegaDelta
916530f3dc Merge pull request #10911 from GinjaNinja32/table-defines 
improve defines in table code
 2015-08-28 07:27:12 +02:00
GinjaNinja32
a286bd24b4 improve defines in table code 
the defines were inverted, this uninverts them
also fixes #undef of old names for things
 2015-08-28 00:12:18 +01:00
Matthew951
78a129db9d Adds a new set of hair and facial hair 
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
 2015-08-27 14:47:02 -04:00
GinjaNinja32
23f5581a35 Merge pull request #10894 from mwerezak/moderate-virus 
Makes moderate virus events one-shot
 2015-08-27 19:46:11 +01:00
PsiOmega
f68275d91b Improved admin logging. 
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
 2015-08-27 20:20:20 +02:00
PsiOmega
c5e09c30d6 Alters the round duration format, increases Stat inactivity timeout. 
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
 2015-08-27 20:01:38 +02:00
PsiOmega
5873026915 Adds missing message assignment. Removes now unnecessary message formatting. 2015-08-27 19:35:44 +02:00
Peliia
8743cd89a4 Dish Incubator v2 
Adheres to pointers laid out by Ginja.
 2015-08-27 18:59:16 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
Atlantis
52d9f0ebc3 Fixes various turf/atmosphere issues 
- Fixes the fact atmospherics turfs started with only ~5000kPa of relevant gas in them. This was, espicially with nitrogen, insufficient to cover round usage which is in ten thousands.
- N2 tank starts at 90k kPa, O2 at 50k kPa, CO2 and Phoron tanks at 25k kPa and N2O tank at 10k kPa. This is a combination of original values and minor balancing (O2 and N2 is used in air mix so there's a lot of it, while others are less useful/limited to toxins use so they are likely not needed at such amount). These values were verified in-game and are accurate at 20C the gas mix starts on.
- Engine no longer starts hyperpressurised with nitrogen, in a way that somehow causes it to generate 80kW without anyone touching it at all, while using only 40-50kW for circulation and stuff.
- Engine reverted to 80kPa inert N2 atmosphere that's being used for months now and is on master. Unlike 5MPa nitrogen it doesn't prevent usage of different coolant type, and doesn't overpressurise the core.
 2015-08-27 07:40:18 +02:00
Zuhayr
9a23275755 Merge pull request #10893 from mwerezak/zonemerge-fix 
Backports fix for areas not venting when both airlock doors are forced open
 2015-08-27 07:09:50 +09:30
Zuhayr
701282d2b0 Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping 
Must now be adjacent to mobs you are stripping.
 2015-08-27 06:51:54 +09:30
mwerezak
f16be46a56 Makes moderate virus events one-shot 2015-08-26 14:39:29 -04:00
mwerezak
ec7f60f9ad Allows indirectly connected turfs to merge zones if either zone is small enough. 
Fixes #9235

Conflicts:
	code/ZAS/Controller.dm
 2015-08-26 14:25:43 -04:00
HarpyEagle
df3eeb891e Fixes dead people blocking stuff with shields. 2015-08-26 11:51:04 -04:00
Peliia
d9e940c3a6 Dish Incubator Limits 
Imposes limits on the Dish Incubator, it shall no longer have values above the meters on the display.
 2015-08-26 17:12:30 +02:00
HarpyEagle
e152ebcd14 Thrown objects continue flying if reactive teleport armour is triggered. 2015-08-26 10:40:37 -04:00
mwerezak
fb6b94de87 Incorporates laser reflection into the shield system 2015-08-26 10:39:54 -04:00
mwerezak
0a751322e3 Rewrites shield handling 
Rewrites shield handling to be less hardcoded.
Shields now take into account the damage source and direction when blocking.
Riot shields no longer block most bullets, but are better at blocking melee and thrown items than they were previously.
Energy shields block projectiles with a similar probability as they did before, and block melee and thrown as well as riot shields do.
Shields no longer block from directly behind the player.
Weapons now only block melee attacks.
Cool effects when blocking with an energy shield or energy sword (including holoswords).
 2015-08-26 10:39:31 -04:00
Peliia
89629b686f Dish Incubator 
Now the Incubator should stop magically conjuring food whenever there is a beaker without food inside.
 2015-08-26 16:18:36 +02:00
PsiOmegaDelta
85f32efa7a Players can now select their own language shortcut keys. 2015-08-26 15:15:54 +02:00
PsiOmegaDelta
798b060254 Fixes bug with hivemind languages being broken for non-observers. 
Also includes some formatting improvements.
 2015-08-26 13:55:16 +02:00
PsiOmegaDelta
5962656c1e Languages now use alternative prefix keys. 
Makes radio and language key overlaps possible.
It is possible to configure the default language keys server side.
Pending: The possibility for players to configure their own language keys.
 2015-08-26 13:17:57 +02:00
PsiOmegaDelta
9c5aba72f0 Must now be adjacent to mobs you are stripping. 
Fixes #10884.
 2015-08-26 08:12:02 +02:00
Zuhayr
3cf542e5f1 Merge pull request #10869 from Techhead0/dev 
RIG boots may now be worn over shoes.
 2015-08-26 07:32:33 +09:30
Techhead0
6fa45cfaa9 Adds if(check_slot) check. 2015-08-25 16:39:54 -04:00
Zuhayr
a6604b2ca2 Merge pull request #10830 from mwerezak/lighting 
Fixes #10465, escape pod lighting and raider spaceacillin
 2015-08-26 05:50:37 +09:30
Zuhayr
5197178d2b Merge pull request #10878 from PsiOmegaDelta/150825-SpecialMsay 
Restores special admin color in Msay
 2015-08-26 05:50:14 +09:30
Chinsky
905b414da0 Merge pull request #10866 from Kearel/fix 
Fixes #10834, #10836, #10833
 2015-08-25 20:53:20 +03:00
Zuhayr
b7c95f9c00 Merge pull request #10880 from Baystation12/dev-freeze 
Dev freeze
 2015-08-26 03:22:06 +09:30
Zuhayr
950359f629 Merge pull request #10873 from GinjaNinja32/nanoui 
fix #7884, fix #10859
 2015-08-26 03:19:51 +09:30
Zuhayr
f4d27e8b1c Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/admin/verbs/adminsay.dm
 2015-08-26 03:09:11 +09:30
PsiOmega
949cfdfc5b Restores special admin color in Msay 
Restores the special appearance admin name's had when using MSAY, to differentiate them from the masses.
 2015-08-25 19:06:52 +02:00
Techhead0
14d940eac6 Changes .loc= to .forcemove in magboots.dm, rig.dm, and void.dm. 2015-08-25 09:58:44 -04:00
Ccomp5950
2a38a18c4c Merge pull request #10831 from mwerezak/msay 
Changes MSAY to show the ckey/character name like it does with asay
 2015-08-25 09:48:20 -04:00
PsiOmegaDelta
d02108043c Revert "IAA cartridge tweak" 2015-08-25 12:48:42 +02:00
Kelenius
1ac8b94427 Fixes a few issues with the mechfab, fixes #10852 2015-08-25 12:28:20 +03:00
Zuhayr
9b3d21fe1c Merge pull request #10868 from comma/detrevert 
Fixes inconsistency in Detective job datum
 2015-08-25 18:27:30 +09:30
GinjaNinja32
c1ff84dd97 properly fix #7884 2015-08-25 09:11:23 +01:00
GinjaNinja32
ec043ea392 Revert "Revert "Fixes #7884, should fix #10859"" 
This reverts commit c1dc9d3f7e.
 2015-08-25 09:10:11 +01:00
PsiOmegaDelta
2fdf859122 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-25 08:20:13 +02:00
PsiOmegaDelta
713a7bd654 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/flashlight.dm
 2015-08-25 08:12:39 +02:00
Zuhayr
f4c9bc4be6 Amending some loc setting lines. 2015-08-25 12:40:09 +09:30
Zuhayr
9087466552 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 2015-08-25 12:29:59 +09:30
Techhead0
ccaecf4a4e RIG boots may now be worn over shoes. 
Changes rig/proc/toggle_peice() to allow RIG-based magboots to be worn over shoes.
 2015-08-24 20:56:11 -04:00
Chinsky
c1dc9d3f7e Revert "Fixes #7884, should fix #10859" 2015-08-25 03:35:19 +03:00