cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,673 Commits 2 Branches 1 Tag
24e2daa663e586bbe4a57a27da4ea05a8f25fa48
Commit Graph

13064 Commits

Author SHA1 Message Date
PsiOmegaDelta
1fa73c0c18 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-11-03 17:37:46 +01:00
PsiOmegaDelta
42b98c45e4 Merge pull request #11220 from caelaislinn/new_xenoarch_sprites 
Replaces xenoarch gun sprites with CC licenced alternatives from OpenGameArt.org
 2015-11-03 11:14:03 +01:00
HarpyEagle
f49b6d7cd1 Fixes #11405 2015-11-02 23:35:25 -05:00
PsiOmegaDelta
ae4d463fcb Map cleanup, tweaks and merge fixes. 2015-11-02 10:05:14 +01:00
PsiOmegaDelta
19051ec27e Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-11-02 09:25:04 +01:00
PsiOmegaDelta
694a35c10b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-11-02 09:08:06 +01:00
Chinsky
e2bdcef127 Merge pull request #11386 from Dibasic/patch-1 
Reduces wizard subjugate duration
 2015-11-02 00:09:12 +03:00
PsiOmegaDelta
392fd6210d Merge pull request #11388 from PsiOmegaDelta/151028-LiveDroneLIVE 
Allows drones to recharge their synth materials.
 2015-11-01 18:43:43 +01:00
PsiOmegaDelta
8b98b059a4 Merge pull request #11397 from Baystation12/dev-freeze 
Dev freeze
 2015-10-31 16:43:02 +01:00
PsiOmegaDelta
461023b5e7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-10-31 16:31:05 +01:00
Neerti
865f4b1d38 Revert "Comments out clothing coverage." 2015-10-31 04:15:36 -04:00
PsiOmegaDelta
3864257e0b Merge pull request #11321 from mwerezak/lung-rupture 
Resolves #11319
 2015-10-30 19:05:05 +01:00
Mark9013100
61f9608324 Comments out clothing coverage. 
Comments out the slot_is_accessible flag.
 2015-10-30 13:45:43 -04:00
Neerti
1125961c18 Merge branch 'dev2' of https://github.com/PolarisSS13/Polaris into 10/20/2015_finish_ling 2015-10-29 21:45:01 -04:00
Neerti
92c1c468e4 Despite the name, they're not done, because reasons. 2015-10-29 21:22:42 -04:00
Daranz
4b42f69247 Fix a problem with solar control computers not connecting to powernets on build 2015-10-28 13:35:24 -04:00
PsiOmegaDelta
2ba9c7bc79 Allows drones to recharge their synth materials. 
Fixes #11387.
 2015-10-28 09:17:31 +01:00
Dibasic
c905fb9bc7 Reduces wizard subjugate duration 
Reduces wizard subjugate duration to one third of previous duration. General agreement in this thread: http://baystation12.net/forums/threads/vote-remove-wizard-subjugate.1007/

Because a robeless spell shouldn't take you out of the round for as long as the respawn timer lasts.
 2015-10-27 15:14:40 -05:00
PsiOmegaDelta
3dcd35508f Compilation fixes. 2015-10-27 13:43:30 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
 2015-10-27 13:08:33 +01:00
PsiOmegaDelta
dd855b5259 Compilation fixes. 2015-10-27 12:47:35 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-10-27 12:38:28 +01:00
Mark9013100
9b9bcff9de Brings back the Ausop helmets added in one of my earlier PRs. 
Brings back the telescopic shield sprite for the back.
And, as an act of ultimate buuuullshit, a corporate detective uniform, with a detective wardrobe(neither of them are mapped in right now).
 2015-10-26 21:02:16 -04:00
mwerezak
2f4d1dd7b1 Adds IPC specific halloss stun messages 2015-10-25 23:39:06 -04:00
Chinsky
5acf5f1b7b Merge pull request #11177 from PsiOmegaDelta/150923-FlexibleSetup 
Character setup refactor.
 2015-10-26 05:44:13 +03:00
Chinsky
35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix 
Pepperspray and chem smoke fixes
 2015-10-26 05:42:59 +03:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
a3027febee Merge pull request #11373 from Baystation12/master 
Dev-freeze.
 2015-10-25 20:00:44 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00
Chinsky
28637334d4 Merge pull request #11329 from PsiOmegaDelta/151018-FlashRestoration 
Relocates synth flash recharge code.
 2015-10-24 18:59:02 +03:00
PsiOmegaDelta
d845a2f587 Generalizes the feed and force feed checks. 2015-10-23 10:57:55 +02:00
PsiOmegaDelta
8305404a14 Can no longer use utensils to eat if you lack the means. 
Humanoid mobs can no longer eat when missing a mouth or when their mouth is blocked when using utensils, same as when eating food directly.
Fixes  #11333.
 2015-10-22 16:52:07 +02:00
PsiOmegaDelta
0b9b8feb1e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/malfunction/newmalf_ability_trees/tree_networking.dm
 2015-10-21 10:38:57 +02:00
PsiOmegaDelta
db833735a8 Merge pull request #11340 from Baystation12/master 
Dev-freeze.
 2015-10-21 10:36:30 +02:00
Chinsky
18ae968bda Merge pull request #11337 from PsiOmegaDelta/151020-Mmm_hydrogen 
Fixes #11334.
 2015-10-21 01:56:16 +03:00
Chinsky
e5cda9ad60 Merge pull request #11332 from PsiOmegaDelta/151019-BloodUponBlood 
Limits the number of runes to one per turf.
 2015-10-21 01:56:08 +03:00
PsiOmegaDelta
4c96cd62a7 Condiments now check for proximity before continuing with the rest of afterattack. Fixes #11334. 2015-10-20 17:11:55 +02:00
PsiOmegaDelta
55f6c1c0b5 Merge pull request #11204 from Hubblenaut/medical 
Bruise Packs, Changes and small Fixes
 2015-10-19 16:17:16 +02:00
PsiOmegaDelta
b92be265ee Limits the number of runes to one per turf. 
Fixes #11248.
 2015-10-19 12:49:32 +02:00
PsiOmegaDelta
a60103982b Merge pull request #11311 from Ccomp5950/stop_stop_hes_already_dead 
Dead people feel no pain.
 2015-10-19 07:08:25 +02:00
PsiOmegaDelta
64176f1c4e Relocates synth flash recharge code. 
Moves the flash recharge from security modules to all of them. Fixes #11322.
 2015-10-18 17:55:56 +02:00
PsiOmegaDelta
e116721977 Character setup refactoring. 
Begins breaking down the large character setup in more manageable modules, allowing for easier additions, edits, and removals.
 2015-10-18 17:34:35 +02:00
ccomp5950
9aea0cecc7 Dead people feel no pain. 
Resolves #10797
 2015-10-18 01:27:24 -04:00
HarpyEagle
ffc50c3cfa Fixes #11321 2015-10-17 20:53:03 -04:00
Cael Aislinn
105792686a resprites xenoarch items (guns, eguns and other small stuff) and some large artifacts by skowron, reworks preset triggers to be a little more predictable for specific large artifact groups 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-10-17 02:02:55 +10:00
Hubblenaut
cbd0972bfa Bruise packs are used per wound and take time to apply 2015-10-16 16:36:04 +02:00
Atlantis
a70ec21e64 Fixes #11276 
- Re-adjusts two values to take new lighting in account.
- For reference. Turf which has light fixture (large) on it, has light value of 6. An average half-lit turf has around 1.5. These values were obtained via in-game tests.
- Using old values, diona would die (without another light source such as flashlight) when standing on any other turf other than turf with light fixture.
- Now it should be relatively similar to the old values before lighting changes.
 2015-10-16 14:17:47 +02:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
 2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
 2015-10-16 11:04:43 +02:00
ccomp5950
111973ed5c AI's can now use languages through holopads... 
...and have it respect if the listener understands.

Resolves #11113 (AI's speech not timestamped through holopad)
Resolves #11183 (All languages can be understood when AI speaks them through a holopad.)
Resolves #6217  (pAIs cannot hear AI hologram speech)
 2015-10-15 19:56:45 -04:00