cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 08:01:16 +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
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
PsiOmegaDelta
a9f7b3a325 Merge pull request #11247 from Hubblenaut/laundry 
Adds laundry basket
 2015-10-31 11:16:14 +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
2f116e3374 Fixes a mistake involving belts not getting icons. 2015-10-29 21:56:36 -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
PsiOmegaDelta
ab2ddfcba7 Atmospheric computer circuit additions. 
Adds several missing variables used in the construction and deconstruction set of gas management computers. Fixes #11392.
Computers also no longer attemps to qdel a type on Destroy()
 2015-10-29 16:55:58 +01: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
7c7ed0f3fc Crescent windows are now indestructible. 2015-10-28 09:25:12 +01: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
28db4587f2 Fixes #11354 2015-10-26 14:50:52 -04:00
NullSnapshot
d94ece66f1 Fixes: #11354 2015-10-25 21:52:11 -07:00
NullSnapshot
4694a263a7 Fixes: #11351 #11357 #11359 #11361 2015-10-25 21:51:31 -07: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
NullSnapshot
c5fd677206 Fixes #11350 2015-10-25 18:10:14 -07:00
NullSnapshot
00e0014a3f fixes #9962 2015-10-25 17:52:49 -07:00
NullSnapshot
e5ca86c168 fixes random name EAL naming thing... again. 2015-10-25 17:40:34 -07: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
Hubblenaut
ef591fa2b3 Atmos personal locker spawn with atmos tape roll 2015-10-22 14:31:07 +02:00
Hubblenaut
8f921682a0 Police tape rewrite 2015-10-22 14:31:04 +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
7080020997 Merge pull request #11338 from PsiOmegaDelta/151020-TemporarilyForever 
Airlocks should no longer be temporarily electrified for the rest of the round.
 2015-10-21 01:56:32 +03: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
Chinsky
0b81edb0fe Merge pull request #11327 from PsiOmegaDelta/151017-MalfTweaks 
Malf announcement type change.
 2015-10-21 01:54:03 +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
2a936d247d Airlocks should no longer be temporarily electrified for the rest of the round. 
Airlocks are no longer electrified for as long as the round has been going when EMPd.
 2015-10-20 08:33:47 +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
mwerezak
47ace5ed3e Chem smoke refactor 2015-10-18 11:54:17 -04: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