cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 08:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,017 Commits 2 Branches 1 Tag
080e526e9ee6ff8fb0f91ff8d0d86e3b133ff08b
Commit Graph

21008 Commits

Author SHA1 Message Date
PsiOmega
1a11aa7f5c Shuffles de-equipping logic. 2015-08-24 14:24:31 +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
Zuhayr
77e0a72911 Adding tag to droppod mobs prior to being moved into the target area. 2015-08-24 19:13:43 +09:30
Zuhayr
c5972cb421 Removing an istype() check. 2015-08-24 19:03:57 +09:30
Zuhayr
3415f88cc2 Reverting a nonfunctional H to usr change. 2015-08-24 19:02:34 +09:30
Zuhayr
c6964a9b0e Fixes for previous commits. 2015-08-24 18:31:52 +09:30
PsiOmegaDelta
e29f4eb3c1 Compilation and map merge fixes. 2015-08-24 10:45:08 +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
PsiOmegaDelta
d36d6d42e0 Cargo now sorts under their own department in the manifests. 2015-08-24 10:03:15 +02:00
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
4a64862c52 Merge pull request #10839 from mwerezak/antag-fix 
Fixes #10742
 2015-08-24 17:27:47 +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
Zuhayr
4429f027e7 Replacing hardcoded key/name checks in rig admin alert with key_name_admin(). 2015-08-24 16:44:17 +09:30
Zuhayr
e8bf2e4b8f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into hardsuitcontrol 2015-08-24 16:41:39 +09:30
Kelenius
d2ee97c6b7 You guys are hard to please 2015-08-24 09:59:57 +03:00
Zuhayr
ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix 
Fixes adjustBrainLoss
 2015-08-24 15:24:12 +09:30
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
mwerezak
75f19938b3 Fixes an apparent clonexadone typo 2015-08-24 00:04:03 -04:00
Kearel
e8b779a34a language bug fix 2015-08-23 22:37:32 -05:00
mwerezak
c8da3f0590 Fixes #10742 2015-08-23 22:28:29 -04:00
mwerezak
09f1c6054b Changed MSAY to show the ckey/character name like it does with asay 2015-08-23 20:27:56 -04:00
mwerezak
5bcede5801 Fixes adjustBrainLoss 
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
 2015-08-23 20:22:15 -04:00
mwerezak
7c96829ecd Fixes #10828 
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
 2015-08-23 18:19:22 -04:00
Neerti
7fab70767d colony-1 could not be saved, unfortunately. RIP 2015-08-23 18:04:47 -04:00
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1 
Flashlight Icon toggle fix
 2015-08-24 00:40:26 +03:00
Chinsky
13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix 
Fixes limb stump examine text
 2015-08-24 00:31:05 +03:00
mwerezak
39feaf0870 Space areas no longer use dynamic lighting 2015-08-23 17:05:56 -04:00
Ccomp5950
517b685950 Merge pull request #10822 from mwerezak/antag-fix 
Antag Fixes
 2015-08-23 16:24:42 -04:00
Raptor1628
dfeb43c496 Reduces Detective slots. 
One detective to compensate for Security Officer, requested by Virgil
after Officer PR.
 2015-08-23 15:37:24 -04:00
mwerezak
3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -04:00
mwerezak
c16d4aca9a Removes unncessary shuffle 2015-08-23 14:49:30 -04:00
mwerezak
161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
mwerezak
20eeb394cb Fixes #10793 2015-08-23 14:34:37 -04:00
Raptor1628
59c500d01b Adds fourth security officer slot. 
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
 2015-08-23 13:20:41 -04:00
PsiOmega
579c5be239 Makes observers use forceMove. 
This ensures things like OnEnter/Exit, light updates properly for all occasions when a ghost moves, not only for manual movement.
 2015-08-23 17:45:46 +02:00
GinjaNinja32
663aae9786 Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny 
Rig AI fixes.
 2015-08-23 13:33:24 +01:00
volas
d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00
PsiOmega
c7bd20ceb6 Rig AI fixes. 
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
 2015-08-23 13:33:10 +02:00
Neerti
00fa623c9d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	.travis.yml
	code/controllers/configuration.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/computer/communications.dm
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/global.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	polaris.dme
 2015-08-23 01:30:46 -04:00
Neerti
b61b6001a5 Merge pull request #175 from Neerti/8/22/2015_more_ling 
Adds electric lockpick power.
 2015-08-23 01:03:58 -04:00
Neerti
c29b47778f Adds electric lockpick power. 2015-08-23 00:58:27 -04:00
Mark9013100
dff98049c1 Removes wall nanomed access requirement 2015-08-22 22:41:17 -04:00
MrSnapwalk
d45d46f920 Resprites, renames, and repaths the detective uniforms. 2015-08-22 19:43:28 -05:00
Zuhayr
89f498e3e8 Merge pull request #10811 from mwerezak/qdel 
Fixes
 2015-08-23 07:41:10 +09:30
Woodratt
4c09fc1e4a Merge pull request #173 from Woodratt/Woodrat_Work_v8.2 
Woodrat Work v8.2
 2015-08-22 12:42:21 -07:00