cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-11 18:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,011 Commits 2 Branches 1 Tag
a2b24d64b70f4676749fcd8ca8a8b2c5486ae9cd
Commit Graph

6226 Commits

Author SHA1 Message Date
Neerti
bbe8c336b2 Adds socks. 
Conflicts:
	code/modules/client/preferences_savefile.dm
 2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00
PsiOmegaDelta
8341620be4 Merge pull request #11246 from Kelenius/blobPlzGo 
Updates blob
 2015-10-08 07:58:15 +02:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2015-10-07 08:14:30 +02:00
PsiOmegaDelta
c5d8fbfd57 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/modules/mob/living/living_defense.dm
 2015-10-07 08:07:23 +02:00
Chinsky
8107786cbd Merge pull request #11245 from PsiOmegaDelta/151005-RobustRoboticsSpeech 
Makes silicon language handling more robust.
 2015-10-06 19:32:54 +03:00
PsiOmegaDelta
019c147bdc HUD element positioning. 
HUD positions are now relative the client view screen edges instead of absolute.
We don't currently use custom client view ranges, but this potentially makes it more reasonable to implement (an example is a new short sighted species of ours).

Port of https://github.com/d3athrow/vgstation13/pull/5984.
 2015-10-06 12:51:03 +02:00
HarpyEagle
74950268d7 Fixes fire_stacks update logic 2015-10-05 19:24:33 -04:00
Kelenius
83adba88d4 Updates blob 
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106.
Fixes #10705.
 2015-10-05 18:10:16 +03:00
PsiOmegaDelta
bbcadcc080 Makes silicon language handling more robust. 
Also fixes an issue with lists being targets for qdel(). Fixes #11221.
 2015-10-05 11:21:09 +02:00
PsiOmegaDelta
357c716a2b Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-29 11:52:48 +02:00
PsiOmegaDelta
597631687b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-29 11:26:42 +02:00
PsiOmegaDelta
d77bcd7937 The silicon law manager now only requires the host to be conscious. 
This should mean that the law manager is available even for carded AIs, even with the wireless interface disabled. Fixes #11139.
 2015-09-28 21:23:10 +02:00
PsiOmega
e0951b1cf9 has_admin_rights() improvement. 
Now calls the check_rights() proc, which handles all checks for us.
 2015-09-27 17:05:15 +02:00
PsiOmega
63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
 2015-09-27 13:36:56 +02:00
HarpyEagle
380b89fcc0 Fixes #11130, renames aghosted var 
because it is no longer used solely for aghosting.
 2015-09-26 20:48:13 -05:00
mwerezak
03cb79a85d Merge pull request #11187 from PsiOmegaDelta/150925-Destruction 
Destroy tweaks.
 2015-09-26 20:22:01 -05:00
mwerezak
21f679ea8f Merge pull request #11191 from PsiOmegaDelta/150925-RadioActivity 
Makes more sources of radiation respect rad-protection.
 2015-09-26 20:10:47 -05:00
PsiOmega
a3b9ab1236 Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection. 2015-09-26 09:19:58 +02:00
PsiOmegaDelta
9dd1a54191 Destroy tweaks. 
Ports Destroy() proc tweaks from Paradise and /tg/, sourced from https://github.com/ParadiseSS13/Paradise/pull/2091.
Adds returns in Destroy()s, to prepare for future return values.
 2015-09-25 10:44:23 +02:00
Hubblenaut
8d3519e24b Belt layer below suit layer, belts toggleable 2015-09-24 17:48:14 +02:00
Zuhayr
7d7f0da2ca Merge pull request #11156 from PsiOmegaDelta/150920-PunPunOnTheTable 
Species tweaks
 2015-09-21 19:08:53 +09:30
Chinsky
02661be540 Merge pull request #11136 from PsiOmegaDelta/150918-BiasedMeteors 
Meteor events are now direction biased.
 2015-09-21 11:54:10 +03:00
PsiOmegaDelta
d891fba1cc Mob size tweaks. 
Merges the use of the is_small and mob_size into one.
Changes the species size handling to set the mob size instead of being yet another separate var to check.
 2015-09-20 17:12:07 +02:00
PsiOmegaDelta
292c1545cb Species datums now include pass flags. 
Utilized to allow Pun-Pun and other monkeys to once again climb tables.
 2015-09-20 16:13:20 +02:00
Chinsky
6103f688cf Merge pull request #11143 from PsiOmegaDelta/150919-GlowyThings 
More glowy stuff.
 2015-09-20 04:51:01 +03:00
PsiOmegaDelta
bd3b4c5d81 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-19 21:37:05 +02:00
PsiOmegaDelta
de9e68cdcd Merge pull request #11151 from Baystation12/master 
Dev-freeze
 2015-09-19 21:25:15 +02:00
PsiOmegaDelta
59c5807157 Active stunbatons now glow. 2015-09-19 21:12:19 +02:00
PsiOmegaDelta
d65ebf8b90 Meteor events are now direction biased. 
When a meteor event triggers it now selects a main edge to arrive from, with a 20% probability to come from either neighboring edge. Will never arrive from the opposite edge.
The meteor event end time is now made more useful, and is based on a longest delay between meteor waves scenario.
The meteor event now supports multiple station Z-levels.
Removes the meteor sounds, as they can rarely be heard over the explosions anyway.
 2015-09-18 21:45:15 +02:00
PsiOmegaDelta
232dd5bfb1 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
 2015-09-18 08:51:10 +02:00
PsiOmegaDelta
9946c837e4 Merge pull request #11134 from Baystation12/master 
Dev-freeze
 2015-09-18 08:50:11 +02:00
PsiOmegaDelta
dcc4655026 Merge pull request #11112 from caelaislinn/missing_spawn 
QOL feature for mappers
 2015-09-17 21:11:52 +02:00
PsiOmegaDelta
0e4f51413b Merge pull request #11074 from GinjaNinja32/title 
Title screen update
 2015-09-17 21:11:31 +02:00
PsiOmegaDelta
f65649c8ba Fixes Pun-Pun (and other monkeys) pushing people around. 
At some point a return had snuck in before the mob-push/swap flag settings. I blame a merge.
Relocated that code to handle_post_spawn() to hopefully ensure it'll always fire when appropriate.
 2015-09-17 09:40:19 +02:00
GinjaNinja32
a7ed0ff2fb Merge pull request #11124 from PsiOmegaDelta/150916-LawChanneling 
Makes the additional law channel handling more flexible.
 2015-09-17 06:27:41 +01:00
Chinsky
5d1b1cd123 Merge pull request #11096 from PsiOmegaDelta/150913-SneakyMice 
Prevents observer mice from spawning on the admin Z-level.
 2015-09-17 05:42:15 +03:00
PsiOmegaDelta
48ce35a179 Makes the additional law channel handling more flexible. 
It has no particular purpose at this time, except to be a general improvement.
 2015-09-16 16:36:04 +02:00
PsiOmegaDelta
7ce27f76fd Macro refactoring. 
Turns several of the is* procs into istype defines.
 2015-09-16 12:57:14 +02:00
Cael Aislinn
00c9402656 enables spawning at latejoin landmarks instead of space if unable to find appropriate job spawn landmark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-09-16 12:48:37 +10:00
PsiOmega
5863112d2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-09-15 20:31:59 +02:00
PsiOmega
5c1b8380a4 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tanks.dm
 2015-09-15 20:25:13 +02:00
mwerezak
db95743784 Merge pull request #11105 from PsiOmegaDelta/150914-ForcedWheelchair 
Converts some loc = to forceMove()
 2015-09-14 12:11:09 -04:00
PsiOmegaDelta
bb5680193f Converts some loc = to forceMove() 
Fixes #11102.
 2015-09-14 11:13:15 +02:00
PsiOmega
a938c7b648 Prevents observer mice from spawning on the admin Z-level. 2015-09-13 11:35:47 +02:00
PsiOmega
0d91ca0dfd Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
 2015-09-13 10:52:01 +02:00
PsiOmega
830d2feb0d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
 2015-09-13 10:44:06 +02:00
PsiOmega
8d57b2d0a0 Fixes observers being unable to see silicon antag status. 
target_list contains mob/living mobs while the previous loop only looped over living/carbon/human.
To make things a bit of a headache hud_list is defined separately for living/carbon/human and living/silicon, instead of directly on /living.

It is certainly possible to define hud_list at mob/living instead but adding an extra loop for silicons is the method that is least likely to break things, thus the most appropriate for a master fix.
 2015-09-12 14:39:10 +02:00
GinjaNinja32
30782cde8f Remove the need to map in the title screen, move title screen icons into a single file 2015-09-12 08:34:28 +01:00