cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,658 Commits 2 Branches 1 Tag
4e56b82ec09e65fc6744820714c21e5833d3eee6
Commit Graph

12176 Commits

Author SHA1 Message Date
GinjaNinja32
4e56b82ec0 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-22 15:28:49 +01:00
PsiOmega
f1323c35a9 Antags are now never eligible to be patient zero. 
Includes on-station antags. Fixes #10798.
 2015-08-22 14:38:08 +02:00
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +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
eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +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
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
Kelenius
cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
Kelenius
afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
Zuhayr
a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
Zuhayr
b6e7d33f3d Merge pull request #10715 from GinjaNinja32/irc 
Adds settable rank to IRC messages, changes it so non-admins can see …
 2015-08-17 18:51:53 -07:00
GinjaNinja32
f0c8db3d0f Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs 2015-08-18 02:16:50 +01:00
GinjaNinja32
e596d3bdd6 Merge pull request #10681 from mwerezak/lighting 
Ports fix for #10660
 2015-08-17 14:17:53 +01:00
Zuhayr
e61eb26da9 Merge pull request #10701 from GinjaNinja32/virus 
fix #10692
 2015-08-17 03:11:16 -07:00
Zuhayr
b27811ee07 Merge pull request #10700 from GinjaNinja32/locket 
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
 2015-08-17 03:04:42 -07:00
GinjaNinja32
a2817d9b8c fix #10692 2015-08-17 10:54:51 +01:00
GinjaNinja32
4cc31d10d9 Remove Sabess's custom item from code, it's been replaced with an entry in the new system. 2015-08-17 10:31:29 +01:00
PsiOmegaDelta
55bc41241f Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/setup.dm
 2015-08-17 09:37:49 +02:00
Zuhayr
82a368c0c4 Merge pull request #10690 from NullSnapshot/hotfix 
Bandaid fix for process scheduler bloating status tab
 2015-08-16 23:54:34 -07:00
NullSnapshot
e99f98e13f No need for the statpanels. 2015-08-16 23:24:25 -07:00
PsiOmegaDelta
9d0c072b4a Adjusts Bump flags to make ALLMOBS mean all mobs again. 2015-08-17 08:06:42 +02:00
NullSnapshot
438837a9be Moves ProcessScheduler list to new Processes tab. 2015-08-16 22:46:18 -07:00
PsiOmega
4d826e68cb Mob bump fixes. 
ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
 2015-08-16 20:55:02 +02:00
mwerezak
b21bd0c42d Ports fix for #10660 from vg 
Courtesy of PJB3005
 2015-08-16 14:24:44 -04:00
GinjaNinja32
f0c9f16099 Merge pull request #10677 from PsiOmegaDelta/150816-SynthSay 
Synth say fixes.
 2015-08-16 14:55:04 +01:00
GinjaNinja32
0fe3c6e926 Merge pull request #10678 from PsiOmegaDelta/150816-PrivateSay 
Makes the private AI channel truly private.
 2015-08-16 14:53:38 +01:00
PsiOmega
21fd8d825d Makes the private AI channel truly private. 2015-08-16 15:43:28 +02:00
PsiOmega
0b01482eb6 Synth say fixes. 
Adds synth message sanitizing. Fixes #10667.
Makes sure say() code at least to some degree returns expected values. Fixes #10675.
 2015-08-16 14:00:29 +02:00
Zuhayr
0c2d0852ae Merge pull request #10666 from PsiOmegaDelta/150815-RoundDuration 
Round Duration display
 2015-08-16 03:40:23 -07:00
PsiOmegaDelta
7b5b7162d0 Merge pull request #10673 from Baystation12/master 
Dev-freeze
 2015-08-16 10:30:13 +02:00
PsiOmegaDelta
311dbcb0f0 Merge pull request #10658 from mwerezak/chem-fix 
Fixes overdose not working for ingested reagents
 2015-08-16 10:18:16 +02:00
Zuhayr
7e8713039a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-16 05:40:47 -07:00
PsiOmega
1186ec2af6 The stat panel now displays station time along with current round duration. 2015-08-15 22:09:18 +02:00
mwerezak
5f98346ab5 Fixes overdose not working for ingested reagents 2015-08-15 10:22:07 -04:00
Kelenius
cb5df3963a Reverts #10649, fixes #10621 2015-08-15 13:15:52 +03:00
Kelenius
3b29856694 Fixes #10599 2015-08-15 13:04:57 +03:00
PsiOmega
395df6d9c2 Compilation fixes. 2015-08-15 10:58:32 +02:00
PsiOmega
cda0ecfa97 Relocates Malfunction code to appropriate location. 2015-08-15 10:52:39 +02:00
PsiOmega
3a08e2884a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm
 2015-08-15 10:52:17 +02:00
Snapshot
3b7ed9bdc4 Merge pull request #10649 from mwerezak/coffee-fix 
Fixes #10621
 2015-08-14 22:51:43 -07:00
Snapshot
5f5671d21f Merge pull request #10647 from mwerezak/acids 
Fixes #10645
 2015-08-14 22:22:41 -07:00
mwerezak
3163de7a50 Fixes #10621 
Coffee now adds jittery as an overdose effect. Set overdose so that drinking two full cups in one go (60 units) will result in 150 jitteriness.
 2015-08-14 23:44:46 -04:00
Chinsky
4ba0a65420 Merge pull request #10648 from mwerezak/circuit-printer 
Fixes #10637
 2015-08-15 06:37:31 +03:00
mwerezak
a5fd2d386c Fixes #10637 2015-08-14 23:34:24 -04:00
mwerezak
133bc96344 Fixes #10645 
Sets unacidable where appropriate.
 2015-08-14 23:20:10 -04:00
Chinsky
8a21670d0b Merge pull request #10639 from GinjaNinja32/language 
Fix not being able to select Siik'tajr or Sinta'unathi as default via Check-Known-Languages
 2015-08-15 06:11:58 +03:00
Chinsky
6ab8a11da8 Merge pull request #10646 from mwerezak/aghost 
Aghosted mobs no longer act as SSD
 2015-08-15 06:10:49 +03:00
mwerezak
cd153ad975 Aghosted mobs no longer act as SSD 
Removed player_logged var since it didn't serve it's intended purpose and replaced with aghosted var. Changed SSD checks to only look at client since regardless of what key gets set to I think we probably don't want players being told a mob is SSD if there is some client controlling it.
 2015-08-14 22:41:51 -04:00