cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 02:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 2 Branches 1 Tag
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph

5021 Commits

Author SHA1 Message Date
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
PsiOmegaDelta
d02108043c Revert "IAA cartridge tweak" 2015-08-25 12:48:42 +02: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
9087466552 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 2015-08-25 12:29:59 +09:30
Zuhayr
bcca0d4aee Merge pull request #10842 from mwerezak/showers 
Fixes cryogenic showers
 2015-08-25 07:38:19 +09:30
HarpyEagle
e03585898d Cleans up flashlight fix 
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
 2015-08-24 16:31:31 -04:00
Sligneris
d74b8f9dc3 IAA cartridge tweak 
Adds Employment Records to IAA cartridges.
 2015-08-24 21:43:39 +02:00
GinjaNinja32
da43277765 Merge pull request #10851 from PsiOmegaDelta/150824-CorrectCanUseTopicBaseCase 
Corrects CanUseObjTopic base proc
 2015-08-24 12:15:42 +01:00
PsiOmegaDelta
358e50d856 Corrects CanUseObjTopic base proc. 
Now returns 1 instead of 0.
 2015-08-24 12:16:18 +02:00
PsiOmegaDelta
3de6d1b19c Merge pull request #10381 from Zuhayr/hardsuitcontrol 
Rig AI movement and module control buffs.
 2015-08-24 12:04:31 +02:00
PsiOmegaDelta
9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-08-24 10:31:30 +02:00
PsiOmegaDelta
c376c08cc0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/girders.dm
	code/modules/mob/living/carbon/human/human_damage.dm
 2015-08-24 10:23:12 +02:00
Zuhayr
23564bda0c Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess 
Synths now relies on access permissions as well.
 2015-08-24 17:45:10 +09:30
Zuhayr
863d75076d Merge pull request #10759 from mwerezak/girders 
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
 2015-08-24 17:28:08 +09:30
Zuhayr
8bc72a465c Should fix AI-camera breaking when moved between cards. 2015-08-24 17:12:41 +09:30
PsiOmegaDelta
0b163b89ae Fixes #10815. 
Now uses audible message. Added a message for deaf mobs.
 2015-08-24 09:16:35 +02:00
mwerezak
286e16a0f3 Fixes cryogenic showers 
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
 2015-08-24 00:11:40 -04:00
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1 
Flashlight Icon toggle fix
 2015-08-24 00:40:26 +03:00
Zuhayr
89f498e3e8 Merge pull request #10811 from mwerezak/qdel 
Fixes
 2015-08-23 07:41:10 +09:30
mwerezak
d62ff87ec9 Fixes #10689 
Also some refactoring of locker stuffing.
 2015-08-22 14:32:15 -04:00
Zuhayr
9cbacd6653 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/click.dm
 2015-08-23 02:24:34 +09:30
Zuhayr
90e51b87e3 Refactoring hardsuit click checking. 2015-08-23 02:14:55 +09:30
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
GinjaNinja32
2341d2afa9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-22 15:44:02 +01:00
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
Zuhayr
b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2015-08-22 03:57:12 +09:30
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
a00ac82221 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 
Conflicts:
	code/_onclick/rig.dm
 2015-08-22 02:36:05 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
3632acd3db Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess 
Cleans out unused access definitions and sorts access lists.
 2015-08-22 01:34:08 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
1e7251ded4 Id card handling changes. 
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
 2015-08-21 14:04:06 +02:00
mwerezak
8626fbfd39 Removes the reinforce girder verb 2015-08-20 23:50:40 -04:00
mwerezak
db7ba70415 Adds SS13-like interface for reinforcing girders 2015-08-20 23:50:16 -04:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
PsiOmegaDelta
cd06409a1f Makes it possible for syndicate borgs to copy access from other ids. 2015-08-20 13:49:53 +02:00
PsiOmegaDelta
c346b99371 Merge remote-tracking branch 'upstream/dev' into 150817-SynthAccess 
Conflicts:
	code/game/objects/items/weapons/cards_ids.dm
 2015-08-20 12:42:51 +02:00
PsiOmegaDelta
c2e2252342 Synth access and icon update changes. 
Refactors how synthetics set their modules. On login, if appearance selection was initiated but not finalized, the selection options popup again. Fixes a long-standing issue of borgs being able to look like the standard module by loging out.
Ensures the syndicate agent IDs and syndicate borgs will always have the same initial access permissions.
Removes now unnecessary syndicate snowflake code from NanoUI.
Synths now utilize actual ids.
 2015-08-20 12:40:08 +02:00